From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 ad74afb..5f13341 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,10 +1,11 @@
package com.matrix.system.activity.dao;
-import org.apache.ibatis.annotations.Param;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.activity.entity.ActivitySignRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
/**
* @description 签到记录表
@@ -14,6 +15,6 @@
public interface ActivitySignRecordDao extends BaseMapper<ActivitySignRecord>{
ActivitySignRecord selectOneByActIdAndUserIdLikesignTime(@Param("actId")long actId,
- @Param("userId")Long userId, @Param("format")String format);
+ @Param("userId")Long userId, @Param("format")Date format);
}
\ No newline at end of file
--
Gitblit v1.9.1