From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_admin/src/main/java/com/doumee/api/business/ShopController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_admin/src/main/java/com/doumee/api/business/ShopController.java b/server/dmmall_admin/src/main/java/com/doumee/api/business/ShopController.java
index 66a9497..758da45 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/api/business/ShopController.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/api/business/ShopController.java
@@ -40,6 +40,13 @@
public ApiResponse create(@RequestBody Shop shop) {
return ApiResponse.success(shopService.create(shop));
}
+ @PreventRepeat
+ @ApiOperation("璁剧疆渚涜揣浠�")
+ @PostMapping("/setGoodsPrice")
+ @RequiresPermissions("business:shop:update")
+ public ApiResponse setGoodsPrice(@RequestBody Shop shop) {
+ return ApiResponse.success(shopService.setGoodsPrice(shop));
+ }
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@@ -90,8 +97,8 @@
@ApiOperation("鏌ヨ鎵�鏈夋暟鎹�")
@PostMapping("/findAll")
@RequiresPermissions("business:shop:query")
- public ApiResponse<List<Shop>> findAll (@RequestBody PageWrap<Shop> pageWrap) {
- return ApiResponse.success(shopService.findAll(pageWrap));
+ public ApiResponse<List<Shop>> findAll (@RequestBody Shop pageWrap) {
+ return ApiResponse.success(shopService.findList(pageWrap));
}
--
Gitblit v1.9.3