Merge branch '20221111' into 11/24SAAS

src/views/activityScheduling/2021doubleDetail.vue

@@ -45,7 +45,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="giveMemberFlag">
+        <el-form-item prop="giveMemberFlag" v-if="!$route.query.year">
           <el-select
             class="multiple"
             style="width: 180px !important"