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

Mall.Model/Entity/BaseSetUp/RB_Logistics.cs

@@ -35,6 +35,14 @@ namespace Mall.Model.Entity.BaseSetUp
         /// </summary>
         public string ExpressBirdAPIKey { get; set; }
 
+        /// <summary>
+        /// 商户id
+        /// </summary>
         public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
     }
 }

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -140,6 +140,7 @@ namespace Mall.WebApi.Controllers.MallBase
             else
             {
                 query.TenantId = UserInfo.TenantId;
+                query.MallBaseId = UserInfo.MallBaseId;
                 bool result = mallBaseModule.AddOrUpdateLogistics(query);
                 if (result)
                 {