From 827d118f2923861f2aa8871b722f8d104c637a6e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 14 八月 2023 15:55:34 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
index 1409797..2d64d2d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java
@@ -30,6 +30,8 @@
     private Integer gender = SEX_WUMAN;
     /** 涓荤數璇濆彿鐮� */
     private String tel;
+    /** 鐢佃瘽鍖虹爜 */
+    private String telCode;
     /** 瀹㈡埛绫诲瀷 */
     private String userType;
 
@@ -67,7 +69,7 @@
     private String birthDay;
     //鍥藉
     private String country;
-    //鍦板潃绫诲瀷(鍗曚綅銆佸叕鍙搞�佷釜浜�)
+    //鍦板潃绫诲瀷
     private Integer addressType;
     //鐪佷唤
     private String province;

--
Gitblit v1.8.0