From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsService.java
index 57bff2b..6c77644 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/GoodsService.java
@@ -122,7 +122,7 @@
      * @param pageWrap
      * @return
      */
-    IPage<GoodsInfoResponse> getGoodsPage(PageWrap<GoodsRequest> pageWrap);
+    IPage<Goods> getGoodsPage(PageWrap<GoodsRequest> pageWrap);
 
 
     /**
@@ -130,7 +130,7 @@
      * @param goodsId
      * @return
      */
-    GoodsInfoResponse getGoodsInfo(Integer goodsId);
+    Goods getGoodsInfo(Integer goodsId,Integer memberId);
 
 
     /**

--
Gitblit v1.9.3