From c06d972894b536cd96b817c922fb73f69c9d1a71 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 19:28:40 +0800
Subject: [PATCH] fix: 调整店铺与商户绑定方式

---
 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