Merge remote-tracking branch 'origin/master'

Administrator

2018-11-23 9666caad786d890ace2df4594e71cee47bb489b9

 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java

@@ -212,4 +212,15 @@
     */

   public ThreeSale getMyBoss(Long uid);



   public ThreeSale selectByPrimaryKey(Long id);



   /**

    * 查询队员记录  id+uid

    * @param id

    * @param uid

    * @param expire 是否失效状态

    * @return

    */

   public List<ThreeSale> listbyIdAndBossId(Long id, Long uid, Integer expire);



}