From e0075075bc02ed4a0a1adc7fbb9752cc8fbbf575 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 13 八月 2025 19:21:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
index c8ee996..e8f8f75 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -95,7 +96,7 @@
@TableField("point")
private Integer point;
- @ApiModelProperty(value = "1微信，3积分")
+ @ApiModelProperty(value = "1微信，3积分，4组合")
@TableField("pay_method")
private Integer payMethod;
@@ -146,6 +147,5 @@
@ApiModelProperty("退款时间")
@TableField("refund_time")
private LocalDateTime refundTime;
-
}
--
Gitblit v1.7.1