From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml | 34 ----------------------------------
1 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
index ca6e444..424fad2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
@@ -10,7 +10,6 @@
<result column="maintain_time" property="maintainTime"/>
<result column="maintain_content" property="maintainContent"/>
<result column="replace_part" property="replacePart"/>
- <result column="maintain_result" property="maintainResult"/>
<result column="remark" property="remark"/>
<result column="area_code" property="areaCode"/>
<result column="create_user" property="createUser"/>
@@ -41,39 +40,6 @@
</if>
<if test="param2.maintainContent != null and param2.maintainContent != ''">
and maintain_content = #{param2.maintainContent}
- </if>
- <if test="param2.replacePart != null and param2.replacePart != ''">
- and replace_part = #{param2.replacePart}
- </if>
- <if test="param2.maintainResult != null and param2.maintainResult != ''">
- and maintain_result = #{param2.maintainResult}
- </if>
- <if test="param2.remark != null and param2.remark != ''">
- and remark = #{param2.remark}
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and area_code = #{param2.areaCode}
- </if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and create_user = #{param2.createUser}
- </if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and update_time = #{param2.updateTime}
- </if>
- <if test="param2.status != null and param2.status != ''">
- and status = #{param2.status}
- </if>
- <if test="param2.isDeleted != null and param2.isDeleted != ''">
- and is_deleted = #{param2.isDeleted}
</if>
</where>
</select>
--
Gitblit v1.9.3