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/share/UserShareGoodsGroupMapper.java |  118 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsGroupMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsGroupMapper.java
index 682f933..743e363 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsGroupMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsGroupMapper.java
@@ -1,60 +1,60 @@
-package com.yeshi.fanli.dao.mybatis.share;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
-import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
-
-public interface UserShareGoodsGroupMapper {
-
-	int deleteByPrimaryKey(Long id);
-
-	int insert(UserShareGoodsGroup record);
-
-	int insertSelective(UserShareGoodsGroup record);
-
-	UserShareGoodsGroup selectByPrimaryKey(Long id);
-
-	int updateByPrimaryKeySelective(UserShareGoodsGroup record);
-
-	int updateByPrimaryKey(UserShareGoodsGroup record);
-	
-	/**
-	 * 鎵归噺鎻掑叆
-	 * @param list
-	 * @return
-	 */
-	int insertBatch(List<UserShareGoodsGroup> list);
-	
-	
-	/**
-	 * 鎵归噺閫夋嫨鏇存柊
-	 * @param list
-	 * @return
-	 */
-	int updateBatchSelective(List<UserShareGoodsGroup> list);
-	
-	/**
-	 * 鏌ヨ鍒嗕韩鍟嗗搧
-	 * @param recordId
-	 * @return
-	 */
-	List<UserShareGoodsGroup> listByRecordId(@Param("recordId") Long recordId);
-	
-	/**
-	 * 鏌ヨ鍗曚釜鍟嗗搧 鍒ゆ柇鏄惁鍗曚釜鍟嗗搧鍒嗕韩
-	 * @param recordId
-	 * @return
-	 */
-	UserShareGoodsGroup getSingleGoods(@Param("source") ShareSourceTypeEnum source, @Param("cid") Long cid, @Param("uid") Long uid);
-	
-	/**
-	 * 鏌ヨ鏈�鏂版洿鏂扮殑鍟嗗搧
-	 * @param cid
-	 * @param auctionId
-	 * @return
-	 */
-	UserShareGoodsGroup getNewestRecord (@Param("uid") Long uid, @Param("auctionId") Long auctionId);
+package com.yeshi.fanli.dao.mybatis.share;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
+
+public interface UserShareGoodsGroupMapper {
+
+	int deleteByPrimaryKey(Long id);
+
+	int insert(UserShareGoodsGroup record);
+
+	int insertSelective(UserShareGoodsGroup record);
+
+	UserShareGoodsGroup selectByPrimaryKey(Long id);
+
+	int updateByPrimaryKeySelective(UserShareGoodsGroup record);
+
+	int updateByPrimaryKey(UserShareGoodsGroup record);
+	
+	/**
+	 * 鎵归噺鎻掑叆
+	 * @param list
+	 * @return
+	 */
+	int insertBatch(List<UserShareGoodsGroup> list);
+	
+	
+	/**
+	 * 鎵归噺閫夋嫨鏇存柊
+	 * @param list
+	 * @return
+	 */
+	int updateBatchSelective(List<UserShareGoodsGroup> list);
+	
+	/**
+	 * 鏌ヨ鍒嗕韩鍟嗗搧
+	 * @param recordId
+	 * @return
+	 */
+	List<UserShareGoodsGroup> listByRecordId(@Param("recordId") Long recordId);
+	
+	/**
+	 * 鏌ヨ鍗曚釜鍟嗗搧 鍒ゆ柇鏄惁鍗曚釜鍟嗗搧鍒嗕韩
+	 * @param recordId
+	 * @return
+	 */
+	UserShareGoodsGroup getSingleGoods(@Param("source") ShareSourceTypeEnum source, @Param("cid") Long cid, @Param("uid") Long uid);
+	
+	/**
+	 * 鏌ヨ鏈�鏂版洿鏂扮殑鍟嗗搧
+	 * @param cid
+	 * @param auctionId
+	 * @return
+	 */
+	UserShareGoodsGroup getNewestRecord (@Param("uid") Long uid, @Param("goodsId") Long goodsId, @Param("goodsType") Integer goodsType);
 }
\ No newline at end of file

--
Gitblit v1.8.0