From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java b/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java
index 5f13341..41a6db3 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java
@@ -1,11 +1,14 @@
 package com.matrix.system.activity.dao;
 
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.matrix.system.activity.entity.ActivitySignRecord;
+import com.matrix.system.shopXcx.api.vo.ActivitySignRecordVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description 签到记录表
@@ -17,4 +20,5 @@
 	ActivitySignRecord selectOneByActIdAndUserIdLikesignTime(@Param("actId")long actId,
 			@Param("userId")Long userId, @Param("format")Date format);
 
+    List<ActivitySignRecordVo> selectRecordByMonth(@Param("actId")Long actId, @Param("userId")Long userId, @Param("date") DateTime date);
 }
\ No newline at end of file

--
Gitblit v1.9.1