From 7034041e18f2354ac0f4b852f17a09b2144e1091 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 09:31:51 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index c0bcee2..538ee53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -123,6 +123,11 @@
             "cmp.native_place,\n" +
             "cmp.nation, \n" +
             "cmp.label, \n" +
+            "cmp.relation, \n" +
+            "cmp.marriage, \n" +
+            "cmp.culture_level, \n" +
+            "cmp.out_or_local, \n" +
+            "cmp.census_register, \n" +
             "cmp.is_rent \n" +
             "FROM \n" +
             "com_mng_population AS cmp " +
@@ -190,5 +195,9 @@
     @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}")
     UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard);
 
+    @Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where user_id=#{userId}")
+    UserElectronicFileVO getSysUserById(@Param("userId") Long userId);
 
+    @Select("update sys_user set card_photo_front=#{vo.cardPhotoFront},card_photo_back=#{vo.cardPhotoBack},family_book=#{vo.familyBook} where user_id=#{vo.userId}")
+    void updateSysUserElectronicFile(@Param("vo") UserElectronicFileVO vo);
 }

--
Gitblit v1.7.1