Merge branch 'feature/4月-菜单和权限' into dev

src/views/apps/customerApp/add-member-show-rules.vue

@@ -61,6 +61,9 @@ export default {
   data() {
     const valiStoreType = (rules, value, callback) => {
       const data = value.filter(el => !this.selectedTypes.includes(el));
+      if (this.myCustomData.storeType.includes('-1')) {
+        return callback();
+      }
       if (this.storeTypes.every(el => this.selectedTypes.includes(el.value))) {
         return callback(new Error('一种门店类型仅能包含在一个特殊策略中，当前所有门店类型已被其它特殊策略占用，无法创建'));
       }