From a7d770d976a4d421ca7594f6e99daf16c225d49c Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 26 六月 2023 11:54:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java | 1 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 3 +++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
index 1368964..a682a4a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
@@ -19,6 +19,7 @@
@Data
public class EmployeeVo {
+ private String id;
private String unionId;
private String userId;
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 a53e519..4e4d24a 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
@@ -71,4 +71,7 @@
@PostMapping(value = "/emp/check/doctor")
Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);
+ @PostMapping(value = "/emp/detail/name")
+ Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
index 12a8d34..d83a8de 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
@@ -44,4 +44,11 @@
*/
@PostMapping(value = "/shop/detail/vo")
Result getShopDetailVo(@RequestBody ShopDto shopDto);
+
+ /**
+ * 鑾峰彇闂ㄥ簵璇︽儏杩斿洖vo
+ * @return Result
+ */
+ @PostMapping(value = "/shop/detail/name")
+ Result getDetailByName(@RequestBody ShopDto shopDto);
}
--
Gitblit v1.8.0