From 56f732ed7af0e82f32f809ff0797fd0b83b62306 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
similarity index 96%
rename from ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
rename to ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
index bbb2401..bdbdcba 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
@@ -1,4 +1,4 @@
-package model;
+package com.ruoyi.order.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -165,6 +165,10 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
private LocalDateTime createTime;
-
+
+ @ApiModelProperty(value = "预计提货时间")
+ @TableField("expected_delivery_time")
+ private String expectedDeliveryTime;
+
}
--
Gitblit v1.7.1