From 2da6cac0a9bab5ce7ad04ac17f73d456732f907e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 12 二月 2026 09:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/service/business/LabelsService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/LabelsService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/LabelsService.java
index f5480b1..ef0369d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/LabelsService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/LabelsService.java
@@ -135,6 +135,6 @@
      */
     List<LabelsResponse> getGoodsLabels(Integer parentId);
 
-    List<LabelsResponse> getGoodsLabelsByType(Integer type);
+    List<LabelsResponse> getGoodsLabelsByType(Integer type,Integer parentId);
 
 }

--
Gitblit v1.9.3