Merge remote-tracking branch 'origin/div' into div

yujian

2020-03-24 f15acf7f2d57db3a32c574b0dfc21f564dca6024

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderTeamRewardService.java

@@ -106,4 +106,28 @@
   public long countCanSettle(Long uid);

   

   

   /**

    * 能够结算的用户ID列表

    * @Title: listCanSettleUid

    * @Description: 
    * @param page

    * @param count

    * @return 
    * List<Long> 返回类型

    * @throws

    */

   public List<Long> listCanSettleUid(Date time, int page,int count);

	
	
   /**

    * 能够结算的用户ID数量

    * @Title: countCanSettleUid

    * @Description: 
    * @return 
    * long 返回类型

    * @throws

    */

   public long countCanSettleUid(Date time);

	
	
}