diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs index 9220dc4..987bda5 100644 --- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs @@ -433,7 +433,7 @@ namespace Competition.Mysql.DAL public DataSet GetErpriseList(string strWhere) { StringBuilder strSql = new StringBuilder(); - strSql.Append("select T1.MONITOR_ID,T1.MONITOR_NAME,T1.CUSTOMS_CODE,T2.ModelId,T2.ModelName,T2.VersionNumber,T2.MapLongitude,T2.MapLatitude,T2.TrainingSize,T2.ModelResources,T2.UpdateTime,T2.RegistryName from T_BAS_CORPORATION T1 left join v_model_version T2 on T2.MONITOR_ID=T1.MONITOR_ID "); + strSql.Append("select T1.MONITOR_ID,T1.MONITOR_NAME,T1.CUSTOMS_CODE,T2.ModelId,T2.ModelName,T2.VersionNumber,T2.MapLongitude,T2.MapLatitude,T2.TrainingSize,T2.ModelResources,T2.UpdateTime,T2.RegistryName,T2.ModelResourcesPath from T_BAS_CORPORATION T1 left join v_model_version T2 on T2.MONITOR_ID=T1.MONITOR_ID "); if (strWhere.Trim() != "") { strSql.Append(" where " + strWhere); diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetLastVersionController.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetLastVersionController.cs index ba0a349..c4447d7 100644 --- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetLastVersionController.cs +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetLastVersionController.cs @@ -25,7 +25,7 @@ namespace CompetitionAPI.Controllers.version var model = bll.GetModelList("").FirstOrDefault(); if (model != null) { - return Json(Tool.GetJsonWithCode(APICode.Success, new { VersionNumber = model.VersionNumber, UpdateResources = model.UpdateResources })); + return Json(Tool.GetJsonWithCode(APICode.Success, new { VersionNumber = model.VersionNumber, LauncherResources=model.LauncherResources, UpdateResources = model.UpdateResources })); } else { diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user index 89496dc..965c1f1 100644 --- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>F:\项目\福州海关散货系统\项目\FuZhou_Custom_BulkCargo_Server\CompetitionAPI\CompetitionAPI\CompetitionAPI\bin\Release\net6.0\publish\ - True|2024-06-25T00:44:00.2470909Z;False|2024-06-25T08:43:35.7645713+08:00;False|2024-06-19T09:51:07.8834743+08:00;False|2024-06-19T09:50:19.8828059+08:00;False|2024-06-19T09:49:31.4782067+08:00;True|2024-06-19T09:48:29.2943012+08:00;False|2024-06-19T09:48:02.6516665+08:00;True|2024-06-19T09:47:33.8215337+08:00;True|2024-06-17T13:24:10.4995074+08:00;False|2024-06-17T13:21:44.7372628+08:00;False|2024-06-17T13:21:10.7509626+08:00;True|2024-06-17T09:13:25.9817638+08:00;True|2024-06-17T09:00:04.5016133+08:00; + True|2024-06-25T10:55:08.1751359Z;True|2024-06-25T18:47:04.7420194+08:00;True|2024-06-25T18:44:23.4689695+08:00;True|2024-06-25T18:19:40.9912935+08:00;True|2024-06-25T08:44:00.2470909+08:00;False|2024-06-25T08:43:35.7645713+08:00;False|2024-06-19T09:51:07.8834743+08:00;False|2024-06-19T09:50:19.8828059+08:00;False|2024-06-19T09:49:31.4782067+08:00;True|2024-06-19T09:48:29.2943012+08:00;False|2024-06-19T09:48:02.6516665+08:00;True|2024-06-19T09:47:33.8215337+08:00;True|2024-06-17T13:24:10.4995074+08:00;False|2024-06-17T13:21:44.7372628+08:00;False|2024-06-17T13:21:10.7509626+08:00;True|2024-06-17T09:13:25.9817638+08:00;True|2024-06-17T09:00:04.5016133+08:00; \ No newline at end of file