From 00779ea0f8374e5bbdffc8faa20d65e3c72616c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 19:26:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
index ab4f606..35ebd28 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
@@ -33,10 +33,16 @@
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
+    @ApiModelProperty(value = "退款状态(1=退款中,2=退款成功)")
+    @TableField("refund_status")
+    private Integer refundStatus;
 
     @ApiModelProperty(value = "订单编号")
     @TableField("code")
     private String code;
+    @ApiModelProperty(value = "标题")
+    @TableField("title")
+    private String title;
 
     @ApiModelProperty(value = "用户id")
     @TableField("app_user_id")
@@ -98,5 +104,8 @@
     @ApiModelProperty(value = "userUid")
     @TableField(exist = false)
     private String userUid;
+    @ApiModelProperty(value = "购买用户")
+    @TableField(exist = false)
+    private String userPhone;
 
 }

--
Gitblit v1.7.1