From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java
index 37fbd50..72b8686 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java
@@ -97,5 +97,5 @@
      */
     long count(Shares shares);
 
-    Integer count(Date start,Date end, Integer memberId,List<Integer> types);
+    long count(Date start,Date end, Integer memberId,List<Integer> types);
 }

--
Gitblit v1.9.3