From ae195b1a4d78991075e8225fd3824b60166c1a8c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 17:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
index ce55e69..c691ed9 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -18,6 +18,8 @@
<result column="manufacturer" property="manufacturer"/>
<result column="source" property="source"/>
<result column="purpose" property="purpose"/>
+ <result column="charger" property="charger"/>
+ <result column="create_time" property="createTime"/>
</resultMap>
<select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
@@ -31,6 +33,8 @@
b.manufacturer,
b.source,
b.purpose,
+ b.charger,
+ b.create_time,
a.*
from
ja_fw_device_scrap a
@@ -55,6 +59,8 @@
b.manufacturer,
b.source,
b.purpose,
+ b.charger,
+ b.create_time,
a.*
from
ja_fw_device_scrap a
--
Gitblit v1.9.3