debug - 解决合并冲突

Admin.Core.Api/Admin.Core.Model.xml

@@ -2677,7 +2677,9 @@
         </member>
         <member name="P:Admin.Core.Model.xl_recipe.IsCheck">
             <summary>
-            是否产前验证
+            Desc:
+            Default:
+            Nullable:True
             </summary>
         </member>
         <member name="T:Admin.Core.Model.xl_weigh">

Admin.Core.Api/Controllers/Business/WarehouseController.cs

@@ -15,12 +15,9 @@ using Admin.Core.Model.ViewModels;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using System.Collections;
 using NPOI.SS.Formula.Functions;
-<<<<<<< HEAD
 using TouchSocket.Core;
-=======
 using System.Numerics;
 using Admin.Core.IService.IService_New;
->>>>>>> dep_wangsr
 
 namespace Admin.Core.Api.Controllers.Business
 {

Admin.Core.Api/Properties/launchSettings.json

@@ -24,7 +24,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": "true",
-      "applicationUrl": "http://localhost:5001;http://localhost:5000"
+      "applicationUrl": "http://localhost:6062"
       //"applicationUrl": "http://119.45.202.115:5001;http://119.45.202.115:5000"
 
     }

Admin.Core.Model/Model_New/xl_recipe.cs

@@ -153,5 +153,11 @@ namespace Admin.Core.Model
         /// Nullable:True
         /// </summary>
         public DateTime? CreateDateTime { get; set; }
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>
+        public int? IsCheck { get; set; }
     }
 }