From f1d55564c32342c8a0906f4157749b6344eac73f Mon Sep 17 00:00:00 2001
From: cb <642514070@qq.com>
Date: Sun, 13 Jul 2025 09:09:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E8=B4=A7=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=20=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/order/domain/OrderDetail.java     |  4 ++--
 .../mapper/order/OrderDetailMapper.xml        | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index bed70f97..81ea73d0 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -74,10 +74,10 @@ public class OrderDetail extends BaseEntity {
     private String orderImgs;
 
     @Excel(name = "交货图片", cellType = Excel.ColumnType.STRING)
-    private String deliveryImages;
+    private String handoverImages;
 
     @Excel(name = "交货备注", cellType = Excel.ColumnType.STRING)
-    private String deliveryRemark;
+    private String handoverRemark;
 
     @Excel(name = "进入确认中时间", cellType = Excel.ColumnType.STRING)
     private Date confirmStartTime;
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index a45ab7f2..028b5424 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -30,8 +30,8 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
-        <result property="deliveryImages" column="delivery_images"/>
-        <result property="deliveryRemark" column="delivery_remark"/>
+        <result property="handoverImages" column="handover_images"/>
+        <result property="handoverRemark" column="handover_remark"/>
         <result property="confirmStartTime" column="confirm_start_time"/>
         <result property="timeout" column="timeout_"/>
         <result property="afterTimeout" column="after_timeout"/>
@@ -63,8 +63,8 @@
                create_time,
                update_time,
                remark,
-               delivery_images,
-               delivery_remark,
+               handover_images,
+               handover_remark,
                confirm_start_time,
                timeout_,
                timeout_fine_times,
@@ -97,8 +97,8 @@
                od.create_time,
                od.update_time,
                od.remark,
-               od.delivery_images,
-               od.delivery_remark,
+               od.handover_images,
+               od.handover_remark,
                od.confirm_start_time,
                od.draw_cash_status,
                od.timeout_,
@@ -363,8 +363,8 @@
             <if test="drawCashStatus != null">draw_cash_status = #{drawCashStatus},</if>
             <if test="clockInLocation != null and clockInLocation != ''">clock_in_location = #{clockInLocation},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="deliveryImages != null">delivery_images = #{deliveryImages},</if>
-            <if test="deliveryRemark != null">delivery_remark = #{deliveryRemark},</if>
+            <if test="handoverImages != null">handover_images = #{handoverImages},</if>
+            <if test="handoverRemark != null">handover_remark = #{handoverRemark},</if>
             <if test="confirmStartTime != null">confirm_start_time = #{confirmStartTime},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="ledgerAccountStatus != null">ledger_account_status = #{ledgerAccountStatus},</if>
@@ -424,8 +424,8 @@
         <if test="workerId != null and workerId != 0">worker_id,</if>
         <if test="revTime != null">rev_time,</if>
         <if test="remark != null">remark,</if>
-        <if test="deliveryImages != null">delivery_images,</if>
-        <if test="deliveryRemark != null">delivery_remark,</if>
+                                         <if test="handoverImages != null">handover_images,</if>
+             <if test="handoverRemark != null">handover_remark,</if>
         <if test="confirmStartTime != null">confirm_start_time,</if>
         <if test="expectTimeStart != null">expect_time_start,</if>
         <if test="expectTimeEnd != null">expect_time_end,</if>
@@ -443,8 +443,8 @@
         <if test="workerId != null and workerId != 0">#{workerId},</if>
         <if test="revTime != null">#{revTime},</if>
         <if test="remark != null">#{remark},</if>
-        <if test="deliveryImages != null">#{deliveryImages},</if>
-        <if test="deliveryRemark != null">#{deliveryRemark},</if>
+                    <if test="handoverImages != null">#{handoverImages},</if>
+            <if test="handoverRemark != null">#{handoverRemark},</if>
         <if test="confirmStartTime != null">#{confirmStartTime},</if>
         <if test="expectTimeStart != null">#{expectTimeStart},</if>
         <if test="expectTimeEnd != null">#{expectTimeEnd},</if>