Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-07-27 e209c5e490f56c80c209fbe9c3613069cc0dd70d

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

@@ -225,9 +225,6 @@
            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
            "AND cmp.remark = #{comMngPopulationVO.remark} " +
            " </if> " +
            "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != &quot;&quot;'>" +
            "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%')  " +
            " </if> " +
            " </where>" +
            " order by cmp.create_at desc" +
            "</script>")
@@ -1047,6 +1044,7 @@
            " cmp.card_no, " +
            " cmp.label, " +
            " cmp.address, " +
            " cmp.culture_level, " +
            " cmp.nation, " +
            " cmp.political_outlook, " +
            " cmp.sex, " +