Merge remote-tracking branch 'origin/master'

yujian

2019-03-06 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1

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

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

   int effectThreeSale(Long workerUid);
	
   /**
    * 删除失效
    * @param bossId
    * @param workerId
    * @return
    */
   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);
	

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