From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
index 6ad4120..afba36e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyDao.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
 import com.panzhihua.common.model.vos.community.ComPropertyVO;
 import com.panzhihua.common.model.vos.community.StatisticsCommVO;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo;
 import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO;
 import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO;
+import com.panzhihua.service_community.entity.ComActAnnouncement;
 import org.apache.ibatis.annotations.Mapper;
 import com.panzhihua.service_community.entity.ComProperty;
 import org.apache.ibatis.annotations.Param;
@@ -104,4 +106,6 @@
      * @return
      */
     List<ComPropertyEquipmentVO> getAlarmPointMapData(@Param("communityId") Long communityId);
+
+    IPage<ComActAnnouncementVO> noticeList(Page page, @Param("propertyId") Long propertyId);
 }

--
Gitblit v1.7.1