From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponRecordMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponRecordMapper.java
index 1c0a64a..97011be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushCouponRecordMapper.java
@@ -22,6 +22,6 @@
 	 * @param uid
 	 * @return
 	 */
-	List<PushCouponRecord> listByUid( @Param("uid") Long uid);
+	List<PushCouponRecord> listByUid(@Param("uid") Long uid);
 	
 }
\ No newline at end of file

--
Gitblit v1.8.0