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 |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 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 56b3b78..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,11 +1,10 @@
 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;
 
 /**
  * @ClassName Feign失败配置
@@ -33,7 +32,27 @@
 	}
 
 	@Override
-	public List<PersonVO> getUserListByResGuid(String res_cd) {
+	public int syncharonization_add_user() {
+		return 0;
+	}
+
+	@Override
+	public int syncharonization_update_user() {
+		return 0;
+	}
+
+	@Override
+	public Set<String> getPersonListByWaterCodeList(List<String> list) {
+		return null;
+	}
+
+	@Override
+	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