From 9fd5c6f5473e692b2f15d182d07bb5cf278f57a5 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 07 八月 2023 14:59:24 +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 |    2 +-
 1 files changed, 1 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 ce77569..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
@@ -69,7 +69,7 @@
     private String birthDay;
     //鍥藉
     private String country;
-    //鍦板潃绫诲瀷(鍗曚綅銆佸叕鍙搞�佷釜浜�)
+    //鍦板潃绫诲瀷
     private Integer addressType;
     //鐪佷唤
     private String province;

--
Gitblit v1.8.0