Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Product/OrderModule.cs

@@ -4632,7 +4632,7 @@ namespace Mall.Module.Product
                 List<Model.Entity.BaseSetUp.RB_Logistics_Express> ExpressList = new List<Model.Entity.BaseSetUp.RB_Logistics_Express>();
                 if (list.Where(x => x.ReExpressId > 0).Any())
                 {
-                    ExpressList = logistics_ExpressRepository.GetLogisticsExpressList(new Model.Entity.BaseSetUp.RB_Logistics_Express() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }, string.Join(",", list.Where(x => x.ReExpressId > 0).Select(x => x.ReExpressId)));
+                    ExpressList = logistics_ExpressRepository.GetLogisticsExpressList(new Model.Entity.BaseSetUp.RB_Logistics_Express(), string.Join(",", list.Where(x => x.ReExpressId > 0).Select(x => x.ReExpressId)));
                 }
                 foreach (var item in list)
                 {

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -763,8 +763,6 @@ namespace Mall.WebApi.Controllers.MallBase
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             var query = new RB_Logistics_Express();
-            query.TenantId = userInfo.TenantId;
-            query.MallBaseId = userInfo.MallBaseId;
             var list = orderModule.GetLogisticsExpressList(query);
             var result = list.Select(x => new
             {