From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.java
index 2de8ddb..7f4ca3d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.java
@@ -6,7 +6,10 @@
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
 import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
+import cn.gistack.sm.sjztmd.vo.ImageAndVideoVO;
+import cn.gistack.sm.sjztmd.vo.ResGentionVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -35,4 +38,9 @@
 	List<StatisticsBar> getStatisticsBar(@Param("params") StatisticsParams statisticsParams);
 
 	List<StatisticsTable> getStatisticsTable(@Param("params") StatisticsParams statisticsParams);
+
+    List<ImageAndVideoVO> getIamgeAndVideoUrl(IPage<ImageAndVideoVO> page);
+
+
+	List<ResGentionVO> getIamgeAndVideoUrlcopy();
 }

--
Gitblit v1.9.3