From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 九月 2019 16:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java
index 745cdfa..ef68586 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java
@@ -24,5 +24,13 @@
* @param orderId
* @return
*/
- List<ShareGoodsActivityOrder> listByOrderIdAndUid(@Param("uid") Long uid, @Param("orderId") Long orderId);
+ List<ShareGoodsActivityOrder> listByOrderIdAndUid(@Param("uid") Long uid, @Param("orderId") String orderId);
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛鏌ヨ
+ * @param uid
+ * @return
+ */
+ List<ShareGoodsActivityOrder> listByUid(@Param("uid") Long uid);
}
\ No newline at end of file
--
Gitblit v1.8.0