Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-06 76a2734dcde509f71bcbbe01d11ba6a902ca2a15

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java

@@ -682,7 +682,7 @@


        Map<String, List<ComActAcidColorChartsVO>> chartMap = comActAcidColorChartsVOS1
                .stream()
                .stream().sorted(Comparator.comparing(ComActAcidColorChartsVO::getCountName))
                .collect(Collectors.groupingBy(ComActAcidColorChartsVO::getColorMark));

        Map<String,Object> retMap = new HashMap<>();