From d85c814b146f5186d4d651e3e8fbb79dc1050fd2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 15:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 814e30e..0e330fb 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -8,6 +8,7 @@
<result column="device_id" property="deviceId"/>
<result column="area_divide_id" property="areaDivideId"/>
<result column="defense_scene_id" property="defenseSceneId"/>
+ <result column="defense_scene_name" property="defenseSceneName"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
<result column="dispatch_user" property="dispatchUser"/>
@@ -39,6 +40,7 @@
ts.device_id,
ts.area_divide_id,
ts.defense_scene_id,
+ ds.scene_name as defense_scene_name,
ts.longitude,
ts.latitude,
ts.dispatch_user,
--
Gitblit v1.9.3