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/PushGoodsRecordMapper.java |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsRecordMapper.java
index b229edc..b679169 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsRecordMapper.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.entity.push.PushGoodsRecord;
-
-public interface PushGoodsRecordMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(PushGoodsRecord record);
-
-	int insertSelective(PushGoodsRecord record);
-
-	PushGoodsRecord selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(PushGoodsRecord record);
-
-	int updateByPrimaryKey(PushGoodsRecord record);
-	
-	/**
-	 * 鏍规嵁鎺ㄩ�乮d 璁惧id 鏌ヨ
-	 * @param pushId
-	 * @param deviceId
-	 * @return
-	 */
-	List<PushGoodsRecord> listByPushIdAndDeviceId( @Param("pushId")Long pushId, @Param("deviceId") Long deviceId);
+package com.yeshi.fanli.dao.mybatis.push;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.push.PushGoodsRecord;
+
+public interface PushGoodsRecordMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(PushGoodsRecord record);
+
+	int insertSelective(PushGoodsRecord record);
+
+	PushGoodsRecord selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(PushGoodsRecord record);
+
+	int updateByPrimaryKey(PushGoodsRecord record);
+	
+	/**
+	 * 鏍规嵁鎺ㄩ�乮d 璁惧id 鏌ヨ
+	 * @param pushId
+	 * @param deviceId
+	 * @return
+	 */
+	List<PushGoodsRecord> listByPushIdAndDeviceId( @Param("pushId")Long pushId, @Param("deviceId") Long deviceId);
 }
\ No newline at end of file

--
Gitblit v1.8.0