Merge remote-tracking branch 'origin/test' into test

manailin

2021-08-20 51508c8c63bb072739a0e3ae45cb11e7599c8f66

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

@@ -150,7 +150,7 @@
            "cmp.remark, " +
            "cmp.native_place, " +
            "cmp.nation,  " +
            "cmp.label,  " +
            "cmpct.label,  " +
            "cmp.marriage,  " +
            "cmp.culture_level,  " +
            "cmp.profession,  " +
@@ -163,12 +163,13 @@
            "cmp.is_rent  " +
            "FROM  " +
            "com_mng_population AS cmp " +
            " LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id  " +
            "<where>" +
            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>" +
            "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
            " </if> " +
            "<if test='comMngPopulationVO.label != null and comMngPopulationVO.label != &quot;&quot;'>" +
            "AND cmp.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
            "AND cmpct.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
            " </if> " +
            "<if test='comMngPopulationVO.actId != null'>" +
            " and cmp.act_id = #{comMngPopulationVO.actId} " +