Merge branch '0609getMusicFee' into test

src/views/businessManager/shopManager/shopOperation.vue

@@ -644,7 +644,7 @@ export default {
             tempForm.replacementShowOrganId =
               tempForm.replacementShowOrganId.join(",");
           }
-          if(!tempForm.studentShowOrganId&&!tempForm.educationShowOrganId&&!tempForm.courseFeeShowOrganId&&!tempForm.courseFeeShowOrganId&&!tempForm.replacementShowOrganId){
+          if(!tempForm.studentShowOrganId&&!tempForm.educationShowOrganId&&!tempForm.courseFeeShowOrganId&&!tempForm.memberFeeShowOrganId&&!tempForm.replacementShowOrganId){
             this.$message.error('请至少选择一个可见分部')
             return
           }

src/views/resetTeaming/modals/member-setting.vue

@@ -130,7 +130,7 @@ export default {
   async mounted() {
     // 获取所有得会员信息
     try {
-      const res = await getAllmemberRank({isDefault:1});
+      const res = await getAllmemberRank({isDefault:0});
       this.memberRankList = res.data;
     } catch (e) {
       console.log(e);