Merge branch 'test' into 'master'

罗元桥

2021-06-24 16911004fa0999586a7d62b4a0761e463235bcc9

Merge branch 'test' into 'master'

Test

See merge request root/zhihuishequ!85

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

@@ -71,7 +71,7 @@
    @Select("<script> \n"+
            "SELECT\n" +
            "nc.*,\n" +
            "u.`nick_name` AS releaseName,u.`type` as userType\n" +
            "u.`nick_name` AS releaseName,u.image_url,u.`type` as userType\n" +
            ",u.name as communityName\n" +
            "FROM\n" +
            "com_act_neighbor_circle nc\n" +