From bd491c37218b0b3d9b518e4814967d814e781c02 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 18:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
index 21c700c..363448d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
@@ -210,7 +210,7 @@
      * @param shopId
      * @return
      */
-    SaleReportResponse saleReport(SaleReportRequest request, String shopId);
+    SaleReportResponse saleReport(SaleReportRequest request, Integer shopId);
 
 
     String setGoodsPrice(Shop shop);

--
Gitblit v1.9.3