From 698e358a3183e062943fa9dc1b144b6dffb4f66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 14:26:36 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java
index 9899768..2771080 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java
@@ -42,9 +42,9 @@
* @return
*/
List<UserGoodsStorage> listQueryByUid(@Param("start") long start, @Param("count") int count,
- @Param("uid") Long uid);
+ @Param("uid") Long uid, @Param("source")Integer source);
- long countQueryByUid(@Param("uid") Long uid);
+ long countQueryByUid(@Param("uid") Long uid, @Param("source")Integer source);
/**
* 鏍规嵁鐢ㄦ埛id銆� 绠�鐗堝晢鍝� id(CommonGoods.id)
@@ -69,7 +69,7 @@
* @param auctionId 娣樺疂鍟嗗搧 id
* @return
*/
- UserGoodsStorage getByUidAndAuctionId(@Param("uid") Long uid, @Param("auctionId") Long auctionId);
+ UserGoodsStorage getByUidAndAuctionId(@Param("uid") Long uid, @Param("auctionId") Long auctionId, @Param("goodType")Integer goodType);
/**
--
Gitblit v1.8.0