From 0da7066cdd4dc8c6ed7b2b5855202d8c0914f33b Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 21 五月 2021 13:21:17 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 9f7aa26..3e4320c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/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);
 
@@ -353,6 +354,7 @@
             " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
             ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
             ",family_book = #{userArchivesVO.familyBook} \n" +
+            ",job = #{userArchivesVO.job} \n" +
             " where user_id = #{userArchivesVO.userId}")
     void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
 

--
Gitblit v1.7.1