From 479a56a36e5b055d89e3aa27ed0ba405265cd9e9 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期二, 17 十二月 2024 16:10:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/Price.java | 2 +- 1 files changed, 1 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..c834d14 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,7 @@ /** * 获取返佣积分上级类型(1=直推上级,2=直帮上级) */ - private Integer superiorType; + private String superiorType; /** * 核销门店可获得服务费 */ -- Gitblit v1.7.1