Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

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

@@ -264,7 +264,7 @@
          Integer moneyState, String startTime, String endTime, List<Integer> listSource);



   

   public Integer countOrderByTypeAndDate(Integer orderType, String preDay);

   public Long countOrderByTypeAndDate(Integer orderType, String preDay);



   /**

    * 统计订单数量