Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.tsx

@@ -112,10 +112,11 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
     if (JSON.stringify(brandList) === JSON.stringify(selectBrandList)) {
       return
     }
-    if (selectBrandList.length <= 0) {
-      message.error("请选择要推荐的品牌")
-      return
-    } else if (selectBrandList.length > 6) {
+    // if (selectBrandList.length <= 0) {
+    //   message.error("请选择要推荐的品牌")
+    //   return
+    // } else 
+    if (selectBrandList.length > 6) {
       message.error("最多推荐6个品牌")
       return
     }

src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx

@@ -172,10 +172,11 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
     if (JSON.stringify(goodsList) === JSON.stringify(selectGoodsList)) {
       return
     }
-    if (selectGoodsList.length <= 0) {
-      message.error("请选择要推荐的商品")
-      return
-    } else if (selectGoodsList.length > 10) {
+    // if (selectGoodsList.length <= 0) {
+    //   message.error("请选择要推荐的商品")
+    //   return
+    // } else 
+    if (selectGoodsList.length > 10) {
       message.error("最多推荐10件商品")
       return
     }

src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.tsx

@@ -113,10 +113,11 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
       return
     }
 
-    if (selectShopsList.length <= 0) {
-      message.error("请选择要推荐的店铺")
-      return
-    } else if (selectShopsList.length > 5) {
+    // if (selectShopsList.length <= 0) {
+    //   message.error("请选择要推荐的店铺")
+    //   return
+    // } else 
+    if (selectShopsList.length > 5) {
       message.error("最多推荐5个店铺")
       return
     }