From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 08a13a5..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>
@@ -37,11 +38,11 @@
- @ApiModelProperty(value = "3待使用4已完成5已取消6已退款7售后中8已评价")
+ @ApiModelProperty(value = "3待使用4已完成5已取消8已评价")
@TableField("order_status")
private Integer orderStatus;
- @ApiModelProperty(value = "3待使用4已完成5已取消6已退款7售后中8已评价")
+ @ApiModelProperty(value = "3待使用4已完成5已取消8已评价")
@TableField("old_order_status")
private Integer oldOrderStatus;
@@ -66,7 +67,7 @@
@ApiModelProperty(value = "商品数量")
@TableField("num")
private Integer num;
-
+
@ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
@TableField("good_pics")
private String goodPics;
@@ -83,7 +84,7 @@
@ApiModelProperty(value = "积分抵扣金额")
- @TableField("activity_amount")
+ @TableField("point_deduction_amount")
private BigDecimal pointDeductionAmount;
@@ -95,7 +96,7 @@
@TableField("point")
private Integer point;
- @ApiModelProperty(value = "1微信，3积分")
+ @ApiModelProperty(value = "1微信，3积分，4组合")
@TableField("pay_method")
private Integer payMethod;
@@ -130,7 +131,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
private LocalDateTime createTime;
-
+
@ApiModelProperty(value = "预计提货时间")
@TableField("expected_delivery_time")
private String expectedDeliveryTime;
@@ -146,6 +147,5 @@
@ApiModelProperty("退款时间")
@TableField("refund_time")
private LocalDateTime refundTime;
-
}
--
Gitblit v1.7.1