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

DESKTOP-71BH0QO\L、ming

2021-04-28 7ea43dac46900dab7535bdd3ec957b45e43b5270

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java

@@ -44,7 +44,7 @@
            "left join com_act c on u.community_id=c.community_id\n" +
            "<where>" +
            "<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageFeedBackDTO.phone}\n" +
            "and u.phone like concat('%',#{pageFeedBackDTO.phone},'%') \n" +
            " </if> " +
            "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != &quot;&quot;'>" +
            "and u.name like concat('%',#{pageFeedBackDTO.name},'%')   \n" +