From face1a695132461b2a2e6b2c47e3dfe495d9b227 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:18:34 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
index f73faa5..84be003 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
@@ -82,7 +82,7 @@
model.addAttribute("list",list);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
- return PREFIX + "tShop_add.html";
+ return PREFIX + "TShop_add.html";
}
@@ -110,11 +110,13 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",1);
- return PREFIX + "tShop_edit.html";
+ return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_info/{id}")
- public String tCityInfo(@PathVariable Integer id, Model model) {
+ public String tCityInfo(@PathVariable("id") Integer id, Model model) {
+ System.err.println("進入");
TEvaluationListVo vo = evaluationService.info(id);
+ System.err.println("查詢vo");
model.addAttribute("item",vo);
ArrayList<String> strings = new ArrayList<>();
String imgs = vo.getImgs();
@@ -124,14 +126,14 @@
model.addAttribute("imgs",strings);
model.addAttribute("name1",vo.getPName());
model.addAttribute("name2",vo.getCName());
- return PREFIX + "tShop_edit.html";
+ return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_gift/{id}")
public String tCityGift(@PathVariable Integer id, Model model) {
TStore byId = storeService.getById(id);
model.addAttribute("welfarePicture",byId.getWelfarePicture());
model.addAttribute("id",id);
- return PREFIX + "tShop_img.html";
+ return PREFIX + "TShop_img.html";
}
@RequestMapping("/tShop_indexSet/{id}")
public String tCityIndexSet(@PathVariable Integer id, Model model) {
@@ -152,7 +154,7 @@
StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
model.addAttribute("c8",c8);
model.addAttribute("id",id);
- return PREFIX + "tShop_imgAll.html";
+ return PREFIX + "TShop_imgAll.html";
}
--
Gitblit v1.7.1