From 0559035e70ea4cc36011ae37db18ca2805028689 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 20 九月 2023 17:30:35 +0800
Subject: [PATCH] Merge branch 'rx-0918-完善资料' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java                         |    4 ++++
 phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 48d240c..eae2439 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -162,6 +162,10 @@
     /**杞瘖淇℃伅*/
     private UserTransferDto transferRecord;
 
+    /**涓昏璇夋眰**/
+    private String mainAppeal;
+    private String minorAppeal;
+
     public UserParamDto() {
     }
 
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
index 32027cc..dd2365a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/usercompleteInfo/UserInfoCompleteDto.java
@@ -17,7 +17,7 @@
     //閭
     private String email;
     //璇佷欢绫诲瀷
-    private String certificateType;
+    private Integer certificateType;
     //璇佷欢鍙风爜
     private String certificateNo;
     //鍑虹敓鏃ユ湡
@@ -89,11 +89,11 @@
         this.email = email;
     }
 
-    public String getCertificateType() {
+    public Integer getCertificateType() {
         return certificateType;
     }
 
-    public void setCertificateType(String certificateType) {
+    public void setCertificateType(Integer certificateType) {
         this.certificateType = certificateType;
     }
 

--
Gitblit v1.8.0