Merge branch 'cedoodev' into test

CeDo

2021-05-21 0da7066cdd4dc8c6ed7b2b5855202d8c0914f33b

Merge branch 'cedoodev' into test

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

@@ -109,6 +109,7 @@
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
            " </if> " +
            " order by u.user_id desc " +
            "</script>")
    IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO);