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

yujian

2020-03-25 010760fd974453a70948fef465284d8c817314f5

 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);

   

   

}