Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/service/impl/SopAnalyseServiceImpl.java

@@ -35,7 +35,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
         if (group.equals(SopAnalyseGroupEnum.REGION)) {
             list.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
-                map.put("province", k);
+                map.put("region_name", k);
                 processOverviewData(v, map);
                 result.add(map);
             });
@@ -101,7 +101,7 @@ public class SopAnalyseServiceImpl extends ServiceImpl<SopAnalyseMapper, TBSopIn
         } else if (group.equals(SopAnalyseGroupEnum.REGION)) {
             list.stream().collect(Collectors.groupingBy(map -> map.get("region_name"))).forEach((k, v) -> {
                 Map<String, Object> map = new HashMap<>();
-                map.put("province", k);
+                map.put("region_name", k);
                 processing(v, map);
                 result.add(map);
             });