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 @@
-
-
+
+
@@ -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 @@
draw_cash_status = #{drawCashStatus},
clock_in_location = #{clockInLocation},
remark = #{remark},
- delivery_images = #{deliveryImages},
- delivery_remark = #{deliveryRemark},
+ handover_images = #{handoverImages},
+ handover_remark = #{handoverRemark},
confirm_start_time = #{confirmStartTime},
update_by = #{updateBy},
ledger_account_status = #{ledgerAccountStatus},
@@ -424,8 +424,8 @@
worker_id,
rev_time,
remark,
- delivery_images,
- delivery_remark,
+ handover_images,
+ handover_remark,
confirm_start_time,
expect_time_start,
expect_time_end,
@@ -443,8 +443,8 @@
#{workerId},
#{revTime},
#{remark},
- #{deliveryImages},
- #{deliveryRemark},
+ #{handoverImages},
+ #{handoverRemark},
#{confirmStartTime},
#{expectTimeStart},
#{expectTimeEnd},