Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

@@ -26,6 +26,15 @@
   int updateByPrimaryKey(ThreeSale record);

   int effectThreeSale(Long workerUid);
	
   /**
    * 删除失效
    * @param bossId
    * @param workerId
    * @return
    */
   int deleteExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
	

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