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

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportShippingBillTemplate.cs

@@ -58,7 +58,7 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 类型 1 收 2 发 3 通
         /// </summary>
-        [SugarColumn(ColumnDescription = "类型 1 收 2 发 3 通", IsNullable = false, Length = 10)]
+        [SugarColumn(ColumnDescription = "类型 1 收 2 发 3 通", IsNullable = false, Length = 30)]
         public string Type { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Op/Method/ShippingBillTemplateService.cs

@@ -145,7 +145,7 @@ namespace DS.WMS.Core.Op.Method
         {
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
             var data = tenantDb.Queryable<SeaExportShippingBillTemplate>()
-                .Where(a => a.Type == type && a.Status == StatusEnum.Enable)
+                .Where(a => a.Type.Contains(type) && a.Status == StatusEnum.Enable)
                 .Select<ShippingBillTemplateSelectRes>()
                 .ToList();
             return DataResult<List<ShippingBillTemplateSelectRes>>.Success(data, MultiLanguageConst.DataQuerySuccess);