Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java

@@ -241,7 +241,7 @@
    * @param preDay

    * @return

    */

   Integer countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);

   Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);

   

   

}