From 4e01b27642aa6195e4c8a5f49a64e76dd7dea06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 15:46:20 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
index 028efda..3119c67 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
@@ -3,6 +3,7 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsConstant;
 import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.entity.MallGoods;
 import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
 import cc.mrbird.febs.mall.service.IAdminMallMemberService;
 import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
@@ -76,8 +77,8 @@
     @GetMapping("goodsUpdateNew/{id}")
     @RequiresPermissions("goodsUpdateNew:update")
     public String goodsUpdate(@PathVariable long id, Model model) {
-        AdminMailGoodsUpdateVo data = mallGoodsService.getMallGoodsUpdateInfoById(id);
-        model.addAttribute("mailGoodsUpdate", data);
+        MallGoods data = mallGoodsService.selectGoodsById(id);
+        model.addAttribute("goodsInfo", data);
         return FebsUtil.view("modules/goods/goodsUpdateNew");
     }
 }

--
Gitblit v1.9.1