From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 15 一月 2025 15:37:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java index 729ea24..5b9e78d 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java @@ -41,7 +41,11 @@ /** * 获取返佣积分上级类型(1=直推上级,2=直帮上级) */ - private Integer superiorType; + private String superiorType; + /** + * 获取分佣金额上级类型(1=直推上级,2=直帮上级) + */ + private String superiorPriceType; /** * 核销门店可获得服务费 */ -- Gitblit v1.7.1