From cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 21:42:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
index 96f6d58..0e1e0d2 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
@@ -20,6 +20,7 @@
     <resultMap id="gdSupplyDemandAuditAttachmentVOResultMap" type="org.sxkj.gd.orderdata.vo.GdSupplyDemandAuditAttachmentVO" extends="gdSupplyDemandAuditAttachmentResultMap">
         <result column="file_url" property="fileUrl"/>
         <result column="file_size" property="fileSize"/>
+        <result column="file_original_name" property="fileOriginalName"/>
     </resultMap>
 
 
@@ -50,7 +51,8 @@
         select
             audit_attachment.*,
             attach.link as file_url,
-            round(attach.attach_size / 1024 / 1024, 2) as file_size
+            round(attach.attach_size / 1024 / 1024, 2) as file_size,
+            attach.original_name as file_original_name
         from ja_gd_supply_demand_audit_attachment audit_attachment
         left join blade_attach attach on attach.id = audit_attachment.attach_id and attach.is_deleted = 0
         <where>

--
Gitblit v1.9.3