From d2edb2eab776a8bc63301280fd637a868089e194 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 09 Jan 2026 16:06:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
index 1c83f79..590fa41 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -18,6 +18,7 @@
<result column="manufacturer" property="manufacturer"/>
<result column="source" property="source"/>
<result column="purpose" property="purpose"/>
+ <result column="charger" property="charger"/>
</resultMap>
<select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
@@ -31,6 +32,7 @@
b.manufacturer,
b.source,
b.purpose,
+ b.charger,
a.*
from
ja_fw_device_maintain_plan a
@@ -55,6 +57,7 @@
b.manufacturer,
b.source,
b.purpose,
+ b.charger,
a.*
from
ja_fw_device_maintain_plan a
--
Gitblit v1.9.3