Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Sys/Dtos/SysOrgReq.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using System.ComponentModel;
 
 namespace DS.WMS.Core.Sys.Dtos;
 /// <summary>
@@ -98,6 +99,10 @@ public class SysOrgReq
     /// 本地货币
     /// </summary>
     public string LocalCurrency { get; set; }
+    /// <summary>
+    /// 是否结算机构
+    /// </summary>
+    [Description("是否结算机构")]
+    public bool IsSettlementOrg { get; set; } = false;
 
-     
 }

ds-wms-service/DS.WMS.Core/Sys/Dtos/SysOrgRes.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using System.ComponentModel;
 
 namespace DS.WMS.Core.Sys.Dtos;
 /// <summary>
@@ -101,5 +102,9 @@ public class SysOrgRes
     /// </summary>
     public string LocalCurrency { get; set; }
 
-    
+    /// <summary>
+    /// 是否结算机构
+    /// </summary>
+    [Description("是否结算机构")]
+    public bool IsSettlementOrg { get; set; } = false;
 }

ds-wms-service/DS.WMS.Core/Sys/Entity/SysOrg.cs

@@ -102,5 +102,11 @@ public class SysOrg: BaseTenantModel<long>
     /// <summary>
     /// 本地货币
     /// </summary>
-    public string LocalCurrency { get; set; } 
+    public string LocalCurrency { get; set; }
+
+    /// <summary>
+    /// 是否结算机构
+    /// </summary>
+    [Description("是否结算机构")]
+    public bool IsSettlementOrg { get; set; } = false;
 }

ds-wms-service/DS.WMS.MainApi/Controllers/CommonController.cs

@@ -154,7 +154,7 @@ public class CommonController : ApiController
     [Route("GetUserList")]
     public DataResult<List<ApiSelectViewModel>> GetUserList([FromQuery]string queryKey = "")
     {
-        var res = _invokeService.GetUserList();
+        var res = _invokeService.GetUserList(queryKey);
         return res;
     }