From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin

---
 oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
index 51998f3..9fc34c6 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
@@ -96,6 +96,9 @@
     @ApiModelProperty(value = "配送费详情Id")
     private String deliveryFeeId;
 
+    @ApiModelProperty(value = "预计送达时间")
+    private String orderTime;
+
     public void copy(RiderOrderRecord source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

--
Gitblit v1.9.3