Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

src/main/resources/static/components/module/activity/UserDataScope.vue

@@ -102,7 +102,7 @@
         <div class="search-item">
           <div class="search-item-label">人员类型：</div>
           <div class="search-item-option">
-            <dict-select v-model="pageForm.personType" code="PERSON_TYPE" @change="doSearch"
+            <dict-select v-model="pageForm.personType" code="USER_PERSON_TYPE" @change="doSearch"
                          style="width: 100%"></dict-select>
           </div>
         </div>

src/main/resources/static/components/module/activity/UserScope.vue

@@ -675,7 +675,7 @@ module.exports = {
     }
     await this.flushUnits()
     await this.getActivityGroup()
-    this.personTypeOptions = await this.$businessTool.getDictOptions("PERSON_TYPE")
+    this.personTypeOptions = await this.$businessTool.getDictOptions("USER_PERSON_TYPE")
     this.userStateOptions = await this.$businessTool.getDictOptions("USER_STATE")
     await this.getRoleListByMenuId()
     await this.pageData()