From 865c5d54ca63ed7a5bda4a92d27ea0b7c6e61b04 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 17 十二月 2025 18:02:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/jiashida

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java
index 1922a07..5f48c40 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCommissionTransactionFlow.java
@@ -48,6 +48,10 @@
     @TableField("order_id")
     private Integer orderId;
 
+    @ApiModelProperty(value = "订单类型(1=大礼包,2=实物商品)")
+    @TableField("order_type")
+    private Integer orderType;
+
     @ApiModelProperty(value = "订单金额")
     @TableField("order_price")
     private BigDecimal orderPrice;

--
Gitblit v1.7.1