From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponActivateMapper.java |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponActivateMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponActivateMapper.java
index a6ef383..c7d653b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponActivateMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponActivateMapper.java
@@ -1,25 +1,25 @@
-package com.yeshi.fanli.dao.mybatis.user;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate;
-
-public interface UserSystemCouponActivateMapper extends BaseMapper<UserSystemCouponActivate> {
-	
-	/**
-	 * 鏌ヨ鏇存柊
-	 * @param id
-	 * @return
-	 */
-	UserSystemCouponActivate selectForUpdate(@Param("id")Long id);
-
-	
-	/**
-	 * 娣诲姞鏁伴噺
-	 * @param id
-	 * @param count
-	 */
-	void addCount(@Param("id")Long id, @Param("count") Integer count);
-	
+package com.yeshi.fanli.dao.mybatis.user;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate;
+
+public interface UserSystemCouponActivateMapper extends BaseMapper<UserSystemCouponActivate> {
+	
+	/**
+	 * 鏌ヨ鏇存柊
+	 * @param id
+	 * @return
+	 */
+	UserSystemCouponActivate selectForUpdate(@Param("id")Long id);
+
+	
+	/**
+	 * 娣诲姞鏁伴噺
+	 * @param id
+	 * @param count
+	 */
+	void addCount(@Param("id")Long id, @Param("count") Integer count);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0