From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushInfoMapper.java | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushInfoMapper.java
index 7b40ee8..213b382 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushInfoMapper.java
@@ -1,36 +1,36 @@
-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.push.PushInfo;
-
-public interface PushInfoMapper extends BaseMapper<PushInfo> {
-
-
- int deleteBatchByPrimaryKey(List<Long> list);
-
- /**
- * 鍚庣鏌ヨ鍒楄〃
- * @param start
- * @param count
- * @param key
- * @param keyType
- * @param state
- * @return
- */
- List<PushInfo> listQuery(@Param("start") long start, @Param("count") int count,
- @Param("key") String key, @Param("keyType") Integer keyType, @Param("state") Integer state
- , @Param("type")String type);
-
- long countQuery(@Param("key") String key, @Param("keyType") Integer keyType,
- @Param("state") Integer state, @Param("type")String type);
-
- /**
- * 闇�瑕佹墽琛屾帹閫佺殑浠诲姟
- * @return
- */
- List<PushInfo> listTask();
+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.push.PushInfo;
+
+public interface PushInfoMapper extends BaseMapper<PushInfo> {
+
+
+ int deleteBatchByPrimaryKey(List<Long> list);
+
+ /**
+ * 鍚庣鏌ヨ鍒楄〃
+ * @param start
+ * @param count
+ * @param key
+ * @param keyType
+ * @param state
+ * @return
+ */
+ List<PushInfo> listQuery(@Param("start") long start, @Param("count") int count,
+ @Param("key") String key, @Param("keyType") Integer keyType, @Param("state") Integer state
+ , @Param("type")String type);
+
+ long countQuery(@Param("key") String key, @Param("keyType") Integer keyType,
+ @Param("state") Integer state, @Param("type")String type);
+
+ /**
+ * 闇�瑕佹墽琛屾帹閫佺殑浠诲姟
+ * @return
+ */
+ List<PushInfo> listTask();
}
\ No newline at end of file
--
Gitblit v1.8.0