Merge branch 'hemenkou_dev' into dev

101captain

2022-03-14 9f0305895a0c7911fc0db879191a5bf4531983db

Merge branch 'hemenkou_dev' into dev

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

@@ -82,7 +82,7 @@
    @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
            "from com_act as ca " +
            "left join com_street as cs on cs.street_id = ca.street_id " +
            "where ca.state = 0 and ca.name like '%#{name}%' and cs.area_code = #{areaCode}")
            "where ca.state = 0 and ca.name like '%#{name}%' and cs.area_code = #{areaCode,jdbcType=VARCHAR}")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("areaCode") String areaCode);

    @Select("SELECT   c.community_id,    c.`name`,    c.street_id,    cs.`name` as streetName," +