From abaf72a337248943e037b02d069c094e2ee5d60b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:52 +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/IAttResManagePersonClientFallback.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java
index 15fa9f3..fab7d6b 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java
@@ -1,10 +1,8 @@
package cn.gistack.sm.sjztmd.feign;
-import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.vo.PersonVO;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
-
import java.util.List;
import java.util.Set;
@@ -34,11 +32,6 @@
}
@Override
- public List<PersonVO> getUserListByResGuid(String res_cd) {
- return null;
- }
-
- @Override
public int syncharonization_add_user() {
return 0;
}
@@ -57,4 +50,9 @@
public List<PersonVO> getCityCountyPersonListByResGuid(String res_cd) {
return null;
}
+
+ @Override
+ public List<PersonVO> getUserListByResGuid(String res_cd, String areaList) {
+ return null;
+ }
}
--
Gitblit v1.9.3