From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
index 27ecd2d..222e2a9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallShopController.java
@@ -2,10 +2,13 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.service.IMallShopService;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller("shopView")
@@ -13,6 +16,8 @@
@RequiredArgsConstructor
public class ViewMallShopController {
+
+ private final IMallShopService mallShopService;
@GetMapping("/shopList")
@RequiresPermissions("shop:view")
@@ -29,8 +34,9 @@
@RequiresPermissions("shop:update")
- @GetMapping("update")
- public String update() {
+ @GetMapping("update/{id}")
+ public String update(@PathVariable("id") Long id, Model model) {
+ model.addAttribute("shopInfo", mallShopService.getById(id));
return FebsUtil.view("modules/shop/update");
}
--
Gitblit v1.9.1