From 0982a97b0c65e11034b9d6b00cc0e4aba39254be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 11:07:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/LabelsApi.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/LabelsApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/LabelsApi.java
index 9e84140..6cd6f16 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/LabelsApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/LabelsApi.java
@@ -12,6 +12,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -48,11 +49,11 @@
@ApiOperation(value = "鑾峰彇鍒嗙被淇℃伅", notes = "灏忕▼搴忕")
@GetMapping("/getGoodsLabelsByType")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷0鍟嗗搧鍒嗙被 1鍟嗗搧鍝佺墝 2鍟嗗鏍囩 3蹇�� 4閫�璐ч�夐」 5鎹㈣揣閫夐」 6閫�娆鹃�夐」 7鍙栨秷璁㈠崟閫夐」 8鍜栧暋鐧剧鍒嗙被 9鍜� 璇㈠垎绫� 10娲诲姩璧涗簨鍒嗙被 11杈句汉鎺㈠簵鍒嗙被", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "parentId", value = "鐖剁骇涓婚敭", required = false),
})
- public ApiResponse<List<LabelsResponse>> getGoodsLabelsByType(Integer type){
- return ApiResponse.success(labelsService.getGoodsLabelsByType(type));
+ public ApiResponse<List<LabelsResponse>> getGoodsLabelsByType(@RequestParam Integer type,Integer parentId){
+ return ApiResponse.success(labelsService.getGoodsLabelsByType(type,parentId));
}
--
Gitblit v1.9.3