From 5bbbe45edd2b1bbb88ef0bd380ec009de86ff2dc Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 27 九月 2023 17:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserBaseInfoDto.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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..b98373f 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
@@ -27,9 +27,11 @@
/** 璇佷欢缂栧彿 */
private String certificateNo;
/** 鎬у埆 */
- private Integer gender = SEX_WUMAN;
+ private Integer gender;
/** 涓荤數璇濆彿鐮� */
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