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

huanghongfa

2021-07-16 a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07

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

@@ -69,10 +69,12 @@
            "cmp.remark, " +
            "cmv.alley, " +
            "cmp.native_place, " +
            "cmphu.relation, " +
            "cmp.nation  " +
            "FROM  " +
            "com_mng_population AS cmp " +
            "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
            "LEFT JOIN com_mng_population_house_user AS cmphu ON cmphu.popul_id = cmp.id " +
            "<where>" +
            "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != &quot;&quot;'>" +
            "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +