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/PushGoodsGroupMapper.java |  140 +++++++++++++++++++++++-----------------------
 1 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsGroupMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsGroupMapper.java
index 4462d7d..fd239d5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsGroupMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsGroupMapper.java
@@ -1,71 +1,71 @@
-package com.yeshi.fanli.dao.mybatis.push;
-
-import java.util.List;
-
-import com.yeshi.fanli.entity.push.PushGoodsGroup;
-
-public interface PushGoodsGroupMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(PushGoodsGroup record);
-
-	int insertSelective(PushGoodsGroup record);
-
-	PushGoodsGroup selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(PushGoodsGroup record);
-
-	int updateByPrimaryKey(PushGoodsGroup record);
-
-	/**
-	 * 鏍规嵁鎺ㄩ�乮d缁熻
-	 * @param pushId
-	 * @return
-	 */
-	long countByPushId(Long pushId);
-	
-	/**
-	 * 鏍规嵁鎺ㄩ�乮d鍒犻櫎鍟嗗搧
-	 * @param pushId
-	 * @return
-	 */
-	int deleteByPushId(Long pushId);
-	
-	
-	/**
-	 * 鏍规嵁鎺ㄩ�乮d鏌ヨ鍟嗗搧
-	 * @param pushId
-	 * @return
-	 */
-	List<PushGoodsGroup> selectByPushId(Long pushId);
-	
-	/**
-	 * 鏍规嵁鎺ㄩ�乮d鏌ヨ鍟嗗搧鎵�鏈変俊鎭�
-	 * @param pushId
-	 * @return
-	 */
-	List<PushGoodsGroup> getAllInfoByPushId(Long pushId);
-	
-	/**
-	 * 鎵归噺鎻掑叆
-	 * @param list
-	 * @return
-	 */
-	int insertBatch(List<PushGoodsGroup> list);
-	
-	/**
-	 * 鎵归噺鍒犻櫎
-	 * @param list
-	 * @return
-	 */
-	int deleteBatchByPrimaryKey(List<Long> list);
-	
-	/**
-	 * 鎵归噺鍒犻櫎 鏍规嵁鎺ㄩ�乮d
-	 * @param list
-	 * @return
-	 */
-	int deleteBatchByPushId(List<Long> list);
-	
+package com.yeshi.fanli.dao.mybatis.push;
+
+import java.util.List;
+
+import com.yeshi.fanli.entity.push.PushGoodsGroup;
+
+public interface PushGoodsGroupMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(PushGoodsGroup record);
+
+	int insertSelective(PushGoodsGroup record);
+
+	PushGoodsGroup selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(PushGoodsGroup record);
+
+	int updateByPrimaryKey(PushGoodsGroup record);
+
+	/**
+	 * 鏍规嵁鎺ㄩ�乮d缁熻
+	 * @param pushId
+	 * @return
+	 */
+	long countByPushId(Long pushId);
+	
+	/**
+	 * 鏍规嵁鎺ㄩ�乮d鍒犻櫎鍟嗗搧
+	 * @param pushId
+	 * @return
+	 */
+	int deleteByPushId(Long pushId);
+	
+	
+	/**
+	 * 鏍规嵁鎺ㄩ�乮d鏌ヨ鍟嗗搧
+	 * @param pushId
+	 * @return
+	 */
+	List<PushGoodsGroup> selectByPushId(Long pushId);
+	
+	/**
+	 * 鏍规嵁鎺ㄩ�乮d鏌ヨ鍟嗗搧鎵�鏈変俊鎭�
+	 * @param pushId
+	 * @return
+	 */
+	List<PushGoodsGroup> getAllInfoByPushId(Long pushId);
+	
+	/**
+	 * 鎵归噺鎻掑叆
+	 * @param list
+	 * @return
+	 */
+	int insertBatch(List<PushGoodsGroup> list);
+	
+	/**
+	 * 鎵归噺鍒犻櫎
+	 * @param list
+	 * @return
+	 */
+	int deleteBatchByPrimaryKey(List<Long> list);
+	
+	/**
+	 * 鎵归噺鍒犻櫎 鏍规嵁鎺ㄩ�乮d
+	 * @param list
+	 * @return
+	 */
+	int deleteBatchByPushId(List<Long> list);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0