From 9006b9705a222cce51daf973fa1bb989cbd2a873 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 13:54:10 +0800
Subject: [PATCH] 合并代码

---
 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 c834d14..729ea24 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 String superiorType;
+    private Integer superiorType;
     /**
      * 核销门店可获得服务费
      */

--
Gitblit v1.7.1