From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseZoneService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseZoneService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseZoneService.java
index be2b8ae..8297a0c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseZoneService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseZoneService.java
@@ -17,6 +17,7 @@
 package org.sxkj.fw.area.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.sxkj.fw.area.dto.FwDefenseZoneDTO;
 import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
 import org.sxkj.fw.area.vo.FwDefenseZoneVO;
 import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
@@ -38,7 +39,15 @@
 	 * @param fwDefenseZone
 	 * @return
 	 */
-	IPage<FwDefenseZoneVO> selectFwDefenseZonePage(IPage<FwDefenseZoneVO> page, FwDefenseZoneVO fwDefenseZone);
+	IPage<FwDefenseZoneVO> selectFwDefenseZonePage(IPage<FwDefenseZoneVO> page, FwDefenseZoneDTO fwDefenseZone);
+
+	/**
+	 * 详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	FwDefenseZoneVO selectFwDefenseZoneDetail(Long id);
 
 
 	/**

--
Gitblit v1.9.3