From 8841ef182bbe06a7ef1f102f51810502dde0a76f Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:26:58 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
index 149958d..a0a2299 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java
@@ -76,7 +76,7 @@
return ResponseEntity.ok(R.success(pageResult));
}
- @GetMapping(value = "/{productId}}")
+ @GetMapping(value = "/{productId}")
@ApiOperation("查询商品")
// @PreAuthorize("@el.check('product:list')")
public ResponseEntity<?> getProduct(@PathVariable Long productId) {
@@ -87,8 +87,8 @@
return ResponseEntity.ok(R.success(product));
}
- @GetMapping(value = "/{productId}}/details")
- @ApiOperation("查询商品")
+ @GetMapping(value = "/{productId}/details")
+ @ApiOperation("查询商品详情")
// @PreAuthorize("@el.check('product:list')")
public ResponseEntity<?> getProductDetails(@PathVariable Long productId) {
Product product = productService.getById(productId);
@@ -99,16 +99,16 @@
return ResponseEntity.ok(R.success(product));
}
- @GetMapping(value = "/{productId}}/images")
- @ApiOperation("查询商品")
+ @GetMapping(value = "/{productId}/images")
+ @ApiOperation("查询商品图片")
// @PreAuthorize("@el.check('product:list')")
public ResponseEntity<?> getProductImages(@PathVariable Long productId) {
return ResponseEntity.ok(R.success(productImageService.queryImagesByProductId(productId)));
}
- @GetMapping(value = "/{productId}}/labels")
- @ApiOperation("查询商品")
+ @GetMapping(value = "/{productId}/labels")
+ @ApiOperation("查询商品标签信息")
// @PreAuthorize("@el.check('product:list')")
public ResponseEntity<?> getProductLabels(@PathVariable Long productId) {
return ResponseEntity.ok(R.success(productLabelService.queryLabelsByProductId(productId)));
--
Gitblit v1.9.3