From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index c3007e3..a585e21 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -211,9 +211,9 @@
*/
@ApiOperation(value = "用户查询列表")
@GetMapping("/users/HDoctorusers")
- public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId) {
+ public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId,boolean isIncluddel) {
if (StringUtils.isNotBlank(hospitalId.toString()) && StringUtils.isNotBlank(departmentId.toString())) {
- return appUserService.hospitalDoctorList(hospitalId, departmentId);
+ return appUserService.hospitalDoctorList(hospitalId, departmentId,isIncluddel);
} else {
return ResultBody.failed("查询参数有误");
}
--
Gitblit v1.8.0