Merge branch 'wuyue' into dev

src/view/memberGroup/memberGroupEdit.vue

@@ -665,7 +665,7 @@ export default {
         });
     },
     getIsAllowAdd() {
-      getIsAllowAdd().then(res => {
+      getIsAllowAdd({ tagGroupId: this.$route.query.memberTagGroupId || undefined }).then(res => {
         res.errorCode === 1 && !res.result && (this.isAllowAdd = res.result);
       })
     }