From b4c4c2f3ed49ad16a35796bde22421203020fc0f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 七月 2025 20:01:34 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
index 4fc2052..921b2a3 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java
@@ -60,7 +60,7 @@
if (null != shop.getBelongShopId()){
Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
merGoodsPageVoList.forEach(merGoodsPageVo -> {
- ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(belongShop.getShopId(), merGoodsPageVo.getGoodsId());
+ ShopGoods shopGoods = shopGoodsService.getByShopIdAndGoodsId(merGoodsPageDto.getShopId(), merGoodsPageVo.getGoodsId());
//后台开启经销商统一售价，且经销商设置了统一售价，加盟商不能修改价格
if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
merGoodsPageVo.setModifyPricePermission(0);
--
Gitblit v1.7.1