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

Mall.Module.TradePavilion/CarrierModule.cs

@@ -337,30 +337,30 @@ namespace Mall.Module.TradePavilion
                     {nameof(RB_Brand_Extend.Logo),model.Logo },
                     {nameof(RB_Brand_Extend.Status),model.Status },
                     {nameof(RB_Brand_Extend.Banner),model.Banner },
-                     {nameof(RB_Brand_Extend.VideoUrl),model.VideoUrl },
-                      {nameof(RB_Brand_Extend.FullBrandName),model.FullBrandName },
-                       {nameof(RB_Brand_Extend.BrandName),model.BrandName },
-                        {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.CustomerType),model.CustomerType },
-                            {nameof(RB_Brand_Extend.StoreExpansion),model.StoreExpansion },
-                             {nameof(RB_Brand_Extend.ProjectType),model.ProjectType },
-                              {nameof(RB_Brand_Extend.AreaRequirement),model.AreaRequirement },
-                          {nameof(RB_Brand_Extend.EndAreaRequirement),model.EndAreaRequirement },
-                         {nameof(RB_Brand_Extend.Advertising),model.Advertising },
-                        {nameof(RB_Brand_Extend.Other),model.Other },
-                          {nameof(RB_Brand_Extend.ShopSize),model.ShopSize },
-                            {nameof(RB_Brand_Extend.Plumbing),model.Plumbing },
-                              {nameof(RB_Brand_Extend.Caliber),model.Caliber },
-                                {nameof(RB_Brand_Extend.Sewage),model.Sewage },
-                                  {nameof(RB_Brand_Extend.RanQi),model.RanQi },
-                                    {nameof(RB_Brand_Extend.DianLiang),model.DianLiang },
-                                      {nameof(RB_Brand_Extend.PaiYan),model.PaiYan },
-                                        {nameof(RB_Brand_Extend.KongTiao),model.KongTiao },
-                                          {nameof(RB_Brand_Extend.XinFeng),model.XinFeng },
-                                            {nameof(RB_Brand_Extend.BrandClassId),model.BrandClassId },
-
+                    {nameof(RB_Brand_Extend.VideoUrl),model.VideoUrl },
+                    {nameof(RB_Brand_Extend.FullBrandName),model.FullBrandName },
+                    {nameof(RB_Brand_Extend.BrandName),model.BrandName },
+                    {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 },
+                    {nameof(RB_Brand_Extend.AreaRequirement),model.AreaRequirement },
+                    {nameof(RB_Brand_Extend.EndAreaRequirement),model.EndAreaRequirement },
+                    {nameof(RB_Brand_Extend.Advertising),model.Advertising },
+                    {nameof(RB_Brand_Extend.Other),model.Other },
+                    {nameof(RB_Brand_Extend.ShopSize),model.ShopSize },
+                    {nameof(RB_Brand_Extend.Plumbing),model.Plumbing },
+                    {nameof(RB_Brand_Extend.Caliber),model.Caliber },
+                    {nameof(RB_Brand_Extend.Sewage),model.Sewage },
+                    {nameof(RB_Brand_Extend.RanQi),model.RanQi },
+                    {nameof(RB_Brand_Extend.DianLiang),model.DianLiang },
+                    {nameof(RB_Brand_Extend.PaiYan),model.PaiYan },
+                    {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>
@@ -518,7 +515,7 @@ namespace Mall.Module.TradePavilion
                                OperatorEnum=OperatorEnum.Equal
                         }
                     };
-                   
+
                     flag = collectRepository.Update(keyValues, wheres);
                 }
             }

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
     }
 }