Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-13 e74987c5c7e6256e84a0852f36a367bf8f2e032d

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

@@ -43,7 +43,7 @@
            "AND community_id=#{comMngStructAreaVO.communityId} \n" +
            " </if> " +
            "<if test='comMngStructAreaVO.areaName != null and comMngStructAreaVO.areaName.trim() != &quot;&quot;'>" +
            "AND area_name = #{comMngStructAreaVO.areaName}" +
            "AND area_name = concat( '%',#{comMngStructAreaVO.areaName}, '%' )" +
            " </if> " +
            "</script>")
    IPage<ComMngStructAreaVO> pageArea(Page page, @Param("comMngStructAreaVO") ComMngStructAreaVO comMngStructAreaVO);