From fe2387482b29c9b56c813cdd1b34eb29294ef9bb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 14 二月 2023 18:28:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java                    |   11 ++++++++++-
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |    4 ++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 8e69929..9e9e894 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -7,8 +7,9 @@
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @Data
 public class UserDto extends PageDto {
-
+    /**鏍囪瘑*/
     private String id;
+    /**鐢ㄦ埛鏍囪瘑*/
     private String userId;
     /**ciq*/
     private String CIQ;
@@ -20,4 +21,12 @@
     private String shopId;
     /**鎵�灞為【闂悕绉�*/
     private String beCorpUser;
+    /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectCorp;
+    /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectShop;
+    /**鏄惁鏈夐棬搴�*/
+    private Integer isHaveShop;
+    /**鏄惁鏈夐【闂�*/
+    private Integer isHaveCorp;
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 7f1e96e..4bdf4f6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -5,6 +5,7 @@
 import com.hz.his.dto.employee.EmpDocDto;
 import com.hz.his.dto.TimeDto;
 import com.hz.his.dto.employee.EmployeeDto;
+import com.hz.his.dto.employee.EmployeeRoleDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,5 +64,8 @@
     @PostMapping(value = "/emp/role/liset")
     Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);
 
+    /**鍛樺伐-瑙掕壊鍒楄〃*/
+    @PostMapping(value = "/emp/role/info/list")
+    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);
 
 }

--
Gitblit v1.8.0