From fd2823afc771def7f9ea1f09d9c38ea8086aa395 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:12:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/OrderGood.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 6545aff..0c87f9c 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
@@ -80,7 +80,7 @@
 
     @ApiModelProperty(value = "获取分佣金额上级类型(1=直推上级,2=直帮上级)")
     @TableField("superior_price_type")
-    private Integer superiorPriceType;
+    private String superiorPriceType;
 
     @ApiModelProperty(value = "核销门店可获得服务费")
     @TableField("servuce_shop_charges")

--
Gitblit v1.7.1