Merge remote-tracking branch 'origin/master'

Administrator

2018-11-23 9666caad786d890ace2df4594e71cee47bb489b9

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java

@@ -165,4 +165,12 @@
     */
    ThreeSale getMyBoss(@Param("uid") Long uid);
    
    /**
     * 根据id、uid查询
     * @param id
     * @param uid
     * @return
     */
    List<ThreeSale> listbyIdAndBossId(@Param("id")Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
    
}