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

Mall.Module.TradePavilion/CarrierModule.cs

@@ -343,6 +343,7 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Brand_Extend.ShopNum),model.ShopNum },
                     {nameof(RB_Brand_Extend.BuiltUpArea),model.BuiltUpArea },
                     {nameof(RB_Brand_Extend.EndBuiltUpArea),model.EndBuiltUpArea },
+                    {nameof(RB_Brand_Extend.BrandType),model.BrandType },
                     {nameof(RB_Brand_Extend.CustomerType),model.CustomerType },
                     {nameof(RB_Brand_Extend.StoreExpansion),model.StoreExpansion },
                     {nameof(RB_Brand_Extend.ProjectType),model.ProjectType },
@@ -360,7 +361,6 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Brand_Extend.KongTiao),model.KongTiao },
                     {nameof(RB_Brand_Extend.XinFeng),model.XinFeng },
                     {nameof(RB_Brand_Extend.BrandClassId),model.BrandClassId },
-
                 };
                 return brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), model.ID));
             }
@@ -379,7 +379,6 @@ namespace Mall.Module.TradePavilion
                 {nameof(RB_Brand_Extend.Status),1 },
             };
             bool flag = brandRepository.Update(fileds, new WhereHelper(nameof(RB_Brand_Extend.ID), CarrierId));
-
             return flag;
         }
 
@@ -443,8 +442,6 @@ namespace Mall.Module.TradePavilion
             }
         }
 
-
-
         /// <summary>
         ///删除品牌状态
         /// </summary>

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -1348,8 +1348,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
-
-
         /// <summary>
         /// 删除品牌信息
         /// </summary>
@@ -1361,10 +1359,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
             var flag = carrierModule.RemoveBrandModule(CarrierId);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
-
-
-
-
         #endregion
     }
 }