From 72a7f0ff972cb612e5793fc86996c31b70e1a969 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 23 八月 2023 14:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
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