Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -140,6 +140,12 @@ public class EnterpriseService {
         statisticMapData.put("performance", performance);
         statisticMapData.put("business", business);
 
+        Map<String, Object> combineMemberMap = dskOpenApiUtil.requestBody("/operate/enterprise/combineMember", paramMap);
+        Integer code = MapUtils.getInteger(combineMemberMap, "code", 300);
+        statisticMapData.put("combineMember", null);
+        if (code.equals(HttpStatus.OK.value())) {
+            statisticMapData.put("combineMember", MapUtils.getMap(combineMemberMap, "data", null));
+        }
         return R.ok(statisticMapData);
     }