Merge remote-tracking branch 'origin/master'

admin

2019-03-01 ba2555b05fcfaacd8c10bbe2cdf3d7e323566871

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

@@ -35,6 +35,14 @@
    */
   int deleteExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
   
   /**
    * 失效
    * @param bossId
    * @param workerId
    * @return
    */
   List<ThreeSale> getExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
	

   /**
    * 查询一度队员集合