From 01572e1f679e789e434e9cdfac491b54b68a0ec0 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:09:18 +0800
Subject: [PATCH] 商户信息

---
 oying-system/src/main/java/com/oying/modules/sh/domain/Order.java |   10 +++++++++-
 1 files changed, 9 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 c899502..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,16 @@
     private String orderRemark;
 
     @NotBlank
-    @ApiModelProperty(value = "预计送达时间")
+    @ApiModelProperty(value = "送达预计时间")
     private String orderTime;
 
+    @ApiModelProperty(value = "送达完成时间")
+    private Timestamp orderFinishTime;
+
+    @NotNull
+    @ApiModelProperty(value = "打包费")
+    private BigDecimal packagingPrice;
+
     @NotNull
     @ApiModelProperty(value = "配送费")
     private BigDecimal sendPrice;

--
Gitblit v1.9.3