Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java

@@ -42,6 +42,7 @@
            "canc.last_fabulous_num," +
            "canc.last_views_num," +
            "canc.type," +
            "canc.topic_id," +
            "su.nick_name as name," +
            "su.community_id," +
            "canct.name as topicName," +