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/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
index 7df55ce..c86285f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
@@ -75,8 +75,8 @@
 	 * @return
 	 */
 	@Override
-	public List<PersonVO> getPersonListByResGuid(String res_cd) {
-		return baseMapper.getPersonListByResGuid(res_cd);
+	public List<PersonVO> getPersonListByResGuid(String res_cd,String areaList) {
+		return baseMapper.getPersonListByResGuid(res_cd,areaList);
 	}
 
 	@Override

--
Gitblit v1.9.3