Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

@@ -172,7 +172,7 @@
   

   

   @Override

   public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {

   public Long countOrderByTypeAndDate(Integer orderType, String preDay) {

      return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);

   }