From 76a2734dcde509f71bcbbe01d11ba6a902ca2a15 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期二, 06 十二月 2022 15:33:06 +0800 Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java index b355920..72bf5de 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java +++ b/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<>(); -- Gitblit v1.7.1