From 8093bf217b5dbe59a5703b013f3fc79ed0d4fc36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 一月 2025 18:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java |   16 ++++++++++++++++
 1 files changed, 16 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 7443f90..6059977 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
@@ -112,5 +112,21 @@
     @TableField("type")
     private Integer type;
 
+    @ApiModelProperty(value = "现金支付(0=否,1=是)")
+    @TableField("cash_payment")
+    private Integer cashPayment;
+
+    @ApiModelProperty(value = "积分支付(0=否,1=是)")
+    @TableField("point_payment")
+    private Integer pointPayment;
+
+    @ApiModelProperty(value = "基础售价")
+    @TableField("selling_price")
+    private BigDecimal sellingPrice;
+
+    @ApiModelProperty(value = "基础积分")
+    @TableField("integral")
+    private Integer integral;
+
 
 }

--
Gitblit v1.7.1