Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 d698714e61e1b322ef12d65a52089ceff8a63703

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

@@ -1,7 +1,9 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;