From 60a099a7edfd81a3b10c766e113c019cdef6cd3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 五月 2020 16:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponMapper.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponMapper.java
index 1661baf..c46d8ea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponMapper.java
@@ -1,30 +1,30 @@
-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.PushCoupon;
-
-public interface PushCouponMapper extends BaseMapper<PushCoupon> {
-
- /**
- * 鍚庣鍒楄〃鏌ヨ
- * @param start
- * @param count
- * @param key
- * @return
- */
- List<PushCoupon> listQuery(@Param("start") long start, @Param("count") int count,
- @Param("key") String key, @Param("state") Integer state);
-
- long countQuery(@Param("key") String key, @Param("state") Integer state);
-
-
- /**
- * 鏈夋晥娲诲姩
- * @return
- */
- List<PushCoupon> listQueryEffective();
+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.PushCoupon;
+
+public interface PushCouponMapper extends BaseMapper<PushCoupon> {
+
+ /**
+ * 鍚庣鍒楄〃鏌ヨ
+ * @param start
+ * @param count
+ * @param key
+ * @return
+ */
+ List<PushCoupon> listQuery(@Param("start") long start, @Param("count") int count,
+ @Param("key") String key, @Param("state") Integer state);
+
+ long countQuery(@Param("key") String key, @Param("state") Integer state);
+
+
+ /**
+ * 鏈夋晥娲诲姩
+ * @return
+ */
+ List<PushCoupon> listQueryEffective();
}
\ No newline at end of file
--
Gitblit v1.8.0