From 37235c82903aaf4e7efe3096174f4a4f6430caef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 09:41:28 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
index dbf7ed5..df3d45f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
@@ -56,7 +56,7 @@
 	/**
 	 * 获取返佣积分上级类型（1=直推上级，2=直帮上级）
 	 */
-	private Integer superiorType;
+	private String superiorType;
 	/**
 	 * 核销门店可获得服务费
 	 */

--
Gitblit v1.7.1