From 85c4410b0948799a93f19f345b4ed18c253c89f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 10:26:33 +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 |    6 ++++++
 1 files changed, 6 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 e01f7f8..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
@@ -165,6 +165,9 @@
     @ApiModelProperty(value = "下单手机号")
     @TableField(exist = false)
     private String phone;
+    @ApiModelProperty(value = "商品/优惠券名称")
+    @TableField(exist = false)
+    private String name;
     @ApiModelProperty(value = "收货人")
     @TableField(exist = false)
     private String receivingName;
@@ -177,5 +180,8 @@
     @ApiModelProperty(value = "取消人")
     @TableField(exist = false)
     private String cancellationName;
+    @ApiModelProperty(value = "订单id")
+    @TableField(exist = false)
+    private String uid;
 
 }

--
Gitblit v1.7.1