Merge branch 'master' into 'test'

罗yu 元桥

2021-04-28 b6082fe75b377ac9c177736d98f36ae46e7cdb70

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

@@ -23,7 +23,7 @@
            "LEFT JOIN sys_user u ON a.create_by = u.user_id "+
            " <where>" +
            "<if test='pageComCvtBusinessDTO.name != null and pageComCvtBusinessDTO.name.trim() != &quot;&quot;'>" +
            " and a.name LIKE concat( #{pageComCvtBusinessDTO.name}, '%' )  " +
            " and a.name LIKE concat( '%', #{pageComCvtBusinessDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComCvtBusinessDTO.communityId != null and pageComCvtBusinessDTO.communityId != 0'>" +
            " and a.community_id = #{pageComCvtBusinessDTO.communityId} " +