Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-26 43c69b2a7ee65a2664b5749cd33cdd3afe50d791

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

@@ -180,7 +180,7 @@
            " AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " +
            " </if> " +
            "<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != &quot;&quot;'>" +
            " AND cmp.label LIKE concat(#{pageInputUserDTO.tags},'%') " +
            " AND cmp.label like concat('%',#{pageInputUserDTO.tags},'%') " +
            " </if> " +
            " order by cmp.create_at desc " +
            "</script>")