From 93e2629252f8ccaf94fe571a1496acfb3087a058 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 03 四月 2023 19:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-合并账号

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 4bdf4f6..270b09c 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
@@ -64,7 +64,7 @@
     @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