From 9f3cd3d14b2025c79296ff6cbc49d7efe3302ec5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 16:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
index 99cdbc5..b3dcf38 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInformationMapper.xml
@@ -11,6 +11,8 @@
<result property="upPath" column="up_path" />
<result property="minioUpPath" column="minio_up_path" />
<result property="upFileSize" column="up_file_size" />
+ <result property="aircraft" column="aircraft" />
+ <result property="aircraftModel" column="aircraft_model" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@@ -24,6 +26,8 @@
up_path,
minio_up_path,
up_file_size,
+ aircraft,
+ aircraft_model,
create_by,
create_time,
update_by,
@@ -54,6 +58,8 @@
<if test="upPath != null">up_path,</if>
<if test="minioUpPath != null">minio_up_path,</if>
<if test="upFileSize != null">up_file_size,</if>
+ <if test="aircraft != null">aircraft,</if>
+ <if test="aircraftModel != null">aircraft_model,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
@@ -66,6 +72,8 @@
<if test="upPath != null">#{upPath},</if>
<if test="minioUpPath != null">#{minioUpPath},</if>
<if test="upFileSize != null">#{upFileSize},</if>
+ <if test="aircraft != null">#{aircraft},</if>
+ <if test="aircraftModel != null">#{aircraftModel},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@@ -81,6 +89,8 @@
<if test="upPath != null">up_path = #{upPath},</if>
<if test="minioUpPath != null">minio_up_path = #{minioUpPath},</if>
<if test="upFileSize != null">up_file_size = #{upFileSize},</if>
+ <if test="aircraft != null">aircraft = #{aircraft},</if>
+ <if test="aircraftModel != null">aircraft_model = #{aircraftModel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
--
Gitblit v1.9.3