From 1ea3061e39af14181bf6a012e964a247456267da Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 06 Mar 2024 09:47:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
index 290a98e..3ad4838 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
@@ -53,10 +53,11 @@
/**
* 根据水库编号查询除责任人之外的人员信息
* @param res_cd
+ * @param areaList
* @return
*/
@GetMapping(GET_USER_LIST_BY_RES_GUID)
- List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd);
+ List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd, @RequestParam("areaList") String areaList);
@PostMapping(SYNCHARONIZATION_ADD_USER)
int syncharonization_add_user();
--
Gitblit v1.9.3