From 98d98236aa182386835d65794f772f6425cb14b5 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 22 十一月 2018 15:02:00 +0800
Subject: [PATCH] Merge branch 'dev1'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
index 7ccb05c..6b833fc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
@@ -165,4 +165,12 @@
      */
     ThreeSale getMyBoss(@Param("uid") Long uid);
     
+    /**
+     * 鏍规嵁id銆乽id鏌ヨ
+     * @param id
+     * @param uid
+     * @return
+     */
+    List<ThreeSale> listbyIdAndBossId(@Param("id")Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
+    
 }
\ No newline at end of file

--
Gitblit v1.8.0