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/impl/SharesServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java
index a23bfe5..1d8d942 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java
@@ -173,7 +173,7 @@
     }
 
     @Override
-    public Integer count(Date start, Date end, Integer memberId,List<Integer> objTypes) {
+    public long count(Date start, Date end, Integer memberId,List<Integer> objTypes) {
         QueryWrapper<Shares> wrapper = new QueryWrapper<>();
         wrapper.lambda().eq(Shares::getMemberId,memberId)
                 .in(!CollectionUtils.isEmpty(objTypes),Shares::getObjType,objTypes)

--
Gitblit v1.9.3