From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..3c30b1b 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;
@@ -29,12 +27,12 @@
}
@Override
- public List<PersonVO> getPersonListByResGuid(String res_cd, String personList) {
- return null;
+ public R getYwxtAdBaseById(String guid) {
+ return R.fail("获取数据失败");
}
@Override
- public List<PersonVO> getUserListByResGuid(String res_cd) {
+ public List<PersonVO> getPersonListByResGuid(String res_cd, String personList) {
return null;
}
@@ -57,4 +55,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