From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java
index 7766ef3..71517d7 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/domain/TVipOrder.java
@@ -60,7 +60,22 @@
*/
@ApiModelProperty(value = "有效期至")
private Date time;
+ /**
+ * 支付方式 1微信2支付宝
+ */
+ @ApiModelProperty(value = "支付方式 1微信2支付宝")
+ private Integer payType;
-
-
+ /**
+ * 内部订单号 退款使用
+ */
+ private String outTradeNo;
+ /**
+ * 外部订单号 退款使用
+ */
+ private String transactionId;
+ /**
+ * 增加会员有效期 单位月
+ */
+ private Integer count;
}
--
Gitblit v1.7.1