From 31eda012c6f3388f1c7441951a250b54c046e7ea Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 09 Jan 2026 17:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 3 +++
1 files changed, 3 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 600abdf..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
@@ -19,6 +19,7 @@
<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">
@@ -33,6 +34,7 @@
b.source,
b.purpose,
b.charger,
+ b.create_time,
a.*
from
ja_fw_device_scrap a
@@ -58,6 +60,7 @@
b.source,
b.purpose,
b.charger,
+ b.create_time,
a.*
from
ja_fw_device_scrap a
--
Gitblit v1.9.3