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

yujian

2019-12-25 59aced4fe04f7e2fdcca81cb9ef279a70522301e

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

@@ -261,6 +261,6 @@
    * @return

    */

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

         Integer source, String startTime, String endTime);
          Integer moneyState, Integer source, String startTime, String endTime);


}