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/OrderGood.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
index 8488894..748a082 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java
@@ -64,10 +64,16 @@
@ApiModelProperty(value = "现金支付（0=否，1=是）")
@TableField("cash_payment")
private Integer cashPayment;
+ @ApiModelProperty(value = "现金支付金额")
+ @TableField(exist = false)
+ private BigDecimal cashPaymentValue;
@ApiModelProperty(value = "积分支付（0=否，1=是）")
@TableField("point_payment")
private Integer pointPayment;
+ @ApiModelProperty(value = "积分支付数量")
+ @TableField(exist = false)
+ private Integer pointPaymentValue;
@ApiModelProperty(value = "基础售价")
@TableField("selling_price")
@@ -77,4 +83,7 @@
@TableField("integral")
private Integer integral;
+ @ApiModelProperty(value = "订单编号 导入使用")
+ @TableField(exist = false)
+ private String orderNumber;
}
--
Gitblit v1.7.1