From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushRecordMapper.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushRecordMapper.java
index 2a0583d..a3e9ea6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushRecordMapper.java
@@ -1,22 +1,22 @@
-package com.yeshi.fanli.dao.mybatis.push;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.xinge.PushRecord;
-
-public interface PushRecordMapper extends BaseMapper<PushRecord>{
-
- List<PushRecord> listQuery(@Param("start")long start, @Param("count") int count, @Param("key") String key,
- @Param("type") Integer type);
-
- Long countQuery(@Param("key") String key, @Param("type") Integer type);
-
-
- PushRecord getByAndroidPushId(@Param("pushId") String pushId);
-
-
- PushRecord getByIosPushId(@Param("pushId") String pushId);
+package com.yeshi.fanli.dao.mybatis.push;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.xinge.PushRecord;
+
+public interface PushRecordMapper extends BaseMapper<PushRecord>{
+
+ List<PushRecord> listQuery(@Param("start")long start, @Param("count") int count, @Param("key") String key,
+ @Param("type") Integer type);
+
+ Long countQuery(@Param("key") String key, @Param("type") Integer type);
+
+
+ PushRecord getByAndroidPushId(@Param("pushId") String pushId);
+
+
+ PushRecord getByIosPushId(@Param("pushId") String pushId);
}
\ No newline at end of file
--
Gitblit v1.8.0