Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-26 0ffd316f9fb2c967f9d643c6a45a965511566aea

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

@@ -257,6 +257,11 @@
    */
   ThreeSale selectLatestByWorkerIdAndState(@Param("workerId") Long workerId,@Param("state") int state);
   
	
	
   /**
    * 根据时间查询邀请关系
    * @param uid
    * @param time
    * @return
    */
   ThreeSale getByWorkerIdAndTime(@Param("workerId") Long workerId, @Param("time") long time);
}