From a4c539d27c6e7f5268bb0a71df935e3cdfcf3a29 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 06 三月 2023 11:47:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

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 9462bd1..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;
@@ -60,4 +61,11 @@
     @PostMapping(value = "/emp/userId/role/check")
     Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto);
 
+    @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