From 4006777cc118ac160fce81f6781b33a6b6307a3b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 30 Jan 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java
index 476920a..8491f19 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java
@@ -16,7 +16,7 @@
  */
 package org.sxkj.fw.area.mapper;
 
-import org.sxkj.fw.area.dto.FwDefenseSceneManageDTO;
+import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
 import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
 import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
 import org.sxkj.fw.area.excel.FwDefenseSceneManageExcel;
@@ -38,10 +38,26 @@
 	 * 自定义分页
 	 *
 	 * @param page
-	 * @param fwDefenseSceneManage
+	 * @param fwDefenseSceneManagePageParam
 	 * @return
 	 */
-	List<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage page, FwDefenseSceneManageDTO fwDefenseSceneManage);
+	List<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam);
+
+	/**
+	 * 详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	FwDefenseSceneManageVO selectFwDefenseSceneManageDetail(@Param("id") Long id);
+
+	/**
+	 * 列表(按时间过滤有效区间)
+	 *
+	 * @param time
+	 * @return
+	 */
+	List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(@Param("time") java.util.Date time);
 
 
 	/**

--
Gitblit v1.9.3