From 94b0a6092c7bcc11bec5f8a3cbee3c46acf12a23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 19:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
index 636d3f6..b1e370b 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
@@ -37,6 +37,9 @@
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
+ @ApiModelProperty(value = "订单标题")
+ @TableField("title")
+ private String title;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
@@ -102,7 +105,7 @@
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消）")
+ @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消 5=交易关闭）")
@TableField("status")
private Integer status;
@@ -180,5 +183,8 @@
@ApiModelProperty(value = "取消人")
@TableField(exist = false)
private String cancellationName;
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String uid;
}
--
Gitblit v1.7.1