From 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179 Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Thu, 07 Aug 2025 15:57:07 +0800 Subject: [PATCH] Merge branch 'master' into xin --- oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java | 7 +++++++ 1 files changed, 7 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..d37fe8e 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,13 @@ @ApiModelProperty(value = "配送费详情Id") private String deliveryFeeId; + @ApiModelProperty(value = "预计送达时间") + private String orderTime; + + @ApiModelProperty(value = "用户手机号") + private String userName; + + public void copy(RiderOrderRecord source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -- Gitblit v1.9.3