Merge branch 'master' into txb

tangxiaobao

2021-08-19 70e63af30affb3dfe68eb92c75802a4acd151383

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

@@ -224,6 +224,9 @@
            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
            "AND cmp.remark = #{comMngPopulationVO.remark} " +
            " </if> " +
            "<if test='comMngPopulationVO.houseId != null and comMngPopulationVO.houseId != &quot;&quot;'>" +
            "AND cmp.house_id = #{comMngPopulationVO.houseId} " +
            " </if> " +
            " </where>" +
            " order by cmp.create_at desc" +
            "</script>")