From 78bbc1dae1bb20acb51fd454adf53b3ab5ae97b3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Dec 2022 15:20:11 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 bcec09e..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,9 +3,11 @@
 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;
+import cc.mrbird.febs.mall.vo.AdminMailGoodsUpdateVo;
 import cc.mrbird.febs.mall.vo.MallMemberVo;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -72,11 +74,11 @@
      * @param model
      * @return
      */
-    @GetMapping("goodsUpdate/{id}")
-    @RequiresPermissions("goodsUpdate:update")
+    @GetMapping("goodsUpdateNew/{id}")
+    @RequiresPermissions("goodsUpdateNew:update")
     public String goodsUpdate(@PathVariable long id, Model model) {
-        AdminMailGoodsDetailVo data = mallGoodsService.getMallGoodsInfoById(id);
-        model.addAttribute("mailGoodsUpdate", data);
-        return FebsUtil.view("modules/goods/goodsUpdate");
+        MallGoods data = mallGoodsService.selectGoodsById(id);
+        model.addAttribute("goodsInfo", data);
+        return FebsUtil.view("modules/goods/goodsUpdateNew");
     }
 }

--
Gitblit v1.9.1