Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-27 4e35951165ec01bb4320cc4365ec94d54490366b

Merge remote-tracking branch 'origin/master'

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

@@ -161,7 +161,7 @@
            "from sys_user u\n" +
            "left join com_act a on u.community_id=a.community_id\n" +
            " where\n" +
            "u.type=1\n" +
            "u.type=1 and u.community_id is not null \n" +
            "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
            " </if> " +