From cb63313e5e30efc4f246546c9c7f07ffeff4a0e2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 九月 2024 19:55:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 c33db7f..eb32601 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
@@ -157,7 +157,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("pay_time")
+ private LocalDateTime payTime;
+ @ApiModelProperty(value = "下单手机号")
+ @TableField(exist = false)
+ private String phone;
+ @ApiModelProperty(value = "商品/优惠券名称")
+ @TableField(exist = false)
+ private String name;
@ApiModelProperty(value = "收货人")
@TableField(exist = false)
private String receivingName;
@@ -170,5 +180,8 @@
@ApiModelProperty(value = "取消人")
@TableField(exist = false)
private String cancellationName;
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String uid;
}
--
Gitblit v1.7.1