From 0e4b49f4bee160790b1830e6a8606e739b32fc3b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 11 三月 2026 09:09:45 +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 fc41eaf..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,Integer memberId);
+ Goods getGoodsInfo(Integer goodsId,Integer memberId);
/**
--
Gitblit v1.9.3