Merge branch 'zhaozhengjie1104'

101captain

2021-11-08 8e24df7313c4d9648bd85b4cf0e1f997e31e6bc3

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

@@ -90,4 +90,7 @@
            "where cs.area_code = '510423' " +
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);

    @Select("select t.community_id,t.`name` from com_act t left join com_street t1 on t.street_id = t1.street_id  where t.state = 0 and t1.street_id in (12,14,15,16,17,18)")
    List<EventGridCommunityAdminVO> getWestCommunityLists();
}