From 6f3c170403f34d452b5dc733043145d8d760fe41 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 05 Sep 2025 18:04:17 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/domain/Order.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java b/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java
index fde0f9d..93dd1ee 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/Order.java
@@ -9,6 +9,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.sql.Timestamp;
import java.util.Objects;
import java.util.Set;
@@ -56,9 +57,12 @@
private String orderRemark;
@NotBlank
- @ApiModelProperty(value = "预计送达时间")
+ @ApiModelProperty(value = "送达预计时间")
private String orderTime;
+ @ApiModelProperty(value = "送达完成时间")
+ private Timestamp orderFinishTime;
+
@NotNull
@ApiModelProperty(value = "打包费")
private BigDecimal packagingPrice;
--
Gitblit v1.9.3