Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -8,6 +8,7 @@


import javax.annotation.Resource;



import org.apache.ibatis.annotations.Param;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -687,5 +688,11 @@
   public ThreeSale selectByWorkerId(Long workerId) {

      return threeSaleMapper.selectSuccessByWorkerId(workerId);

   }

	
	
   @Override

   public List<ThreeSale> getSuccessByDate(Long bossId, Long minTime, Long maxTime){

      return threeSaleMapper.getSuccessByDate(bossId, minTime, maxTime);

   }



}