Merge remote-tracking branch 'origin/dev20230707'

dsk-admin/src/main/resources/application-pre.yml

@@ -14,7 +14,7 @@ shuzhihua:
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
+  captchaType: char
 
 # 开发环境配置
 server:

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -283,8 +283,8 @@ export default {
                 api.centralEnterprsesocial().then(res=>{
                     if(res.code==200){
                         this.isSkeleton = false;
-                        if(res.data.length>0){
-                            res.data.map(item=>{
+                        if(res.data.list.length>0){
+                            res.data.list.map(item=>{
                                 item.page=1
                             })
                         }