From 5f25c762e2853e87fc4b86b157ba87cf1322df2f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 31 八月 2024 14:53:13 +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 |   10 +++++++++-
 1 files changed, 9 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 9679d6a..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
@@ -162,7 +162,12 @@
     @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;
@@ -175,5 +180,8 @@
     @ApiModelProperty(value = "取消人")
     @TableField(exist = false)
     private String cancellationName;
+    @ApiModelProperty(value = "订单id")
+    @TableField(exist = false)
+    private String uid;
 
 }

--
Gitblit v1.7.1