From 993bd61feb3a460a1a2ea96307ae5df967dbb36e Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 31 八月 2022 11:30:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
index 4b9e7fb..97f2c91 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
@@ -4,10 +4,9 @@
* @Author
*/
+import com.hx.resultTool.Result;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
-import com.hx.resultTool.Result;
-import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index eeb2e00..daa96e5 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -49,6 +49,8 @@
private String channelCategory;
/**鎵�灞為棬搴�*/
private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
/**鐢ㄦ埛瑙掕壊*/
private String userRole;
/**鐢ㄦ埛绫诲瀷*/
@@ -57,4 +59,6 @@
private String hisCorpUserId;
/**鎵�灞為【闂�(閿�鍞【闂�)*/
private String hisCorpUser;
+ /**鎬у埆*/
+ private Integer gender;
}
--
Gitblit v1.8.0