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

admin

2020-05-26 8d83c7c3595c1869cd4f406fb106ce59a2fb99ce

 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java

@@ -183,7 +183,7 @@
    * @return

    */

   public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,

          Integer moneyState, String startTime, String endTime, List<Integer> listSource);

          Integer moneyState, String startTime, String endTime, List<Integer> listSource, boolean notBackSuVip);



   

   public Long countOrderByTypeAndDate(Integer orderType, String preDay);