From b7ee93df9c0f10ce17431fd1ef33506742977b82 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 10 五月 2021 16:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
index 7f1e6d1..ef29f88 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
@@ -139,6 +139,11 @@
private Date updateAt;
/**
+ * 收货时间
+ */
+ private Date receivingTime;
+
+ /**
* 订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)
*/
public interface status{
--
Gitblit v1.7.1