From 0381d6fdd6831eb0abdd8bdd90a4a6a7b6e9026c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 十二月 2024 10:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 9519d05..08a06b7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -258,7 +258,7 @@
 			price.setEarnSpendingPoints(goodsSeckill.getEarnSpendingPoints());
 			price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission());
 			price.setSuperiorRebatePoints(goodsSeckill.getSuperiorRebatePoints());
-			price.setSuperiorType(goodsSeckill.getSuperiorType());
+			price.setSuperiorType(String.valueOf(goodsSeckill.getSuperiorType()));
 			price.setServuceShopCharges(goodsSeckill.getServuceShopCharges());
 			price.setServuceShopPoints(goodsSeckill.getServuceShopPoints());
 			price.setTechnicianPoints(goodsSeckill.getTechnicianPoints());

--
Gitblit v1.7.1