From 0dfecde9ebe89ec797b273823c52e44baf056df6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 24 六月 2024 09:51:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
index 7511431..68bc8c1 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java
@@ -103,6 +103,10 @@
@ApiModelProperty(value = "收货人地址")
private String consigneeAddress;
+ @ApiModelProperty(value = "订单备注")
+ @TableField("remark")
+ private String remark;
+
public Integer getId() {
return id;
@@ -195,17 +199,17 @@
@Override
public String toString() {
return "TOrder{" +
- ", id=" + id +
- ", orderNumber=" + orderNumber +
- ", userId=" + userId +
- ", insertTime=" + insertTime +
- ", goodsId=" + goodsId +
- ", count=" + count +
- ", state=" + state +
- ", express=" + express +
- ", expressNumber=" + expressNumber +
- ", expressTime=" + expressTime +
- ", integral=" + integral +
- "}";
+ ", id=" + id +
+ ", orderNumber=" + orderNumber +
+ ", userId=" + userId +
+ ", insertTime=" + insertTime +
+ ", goodsId=" + goodsId +
+ ", count=" + count +
+ ", state=" + state +
+ ", express=" + express +
+ ", expressNumber=" + expressNumber +
+ ", expressTime=" + expressTime +
+ ", integral=" + integral +
+ "}";
}
}
--
Gitblit v1.7.1