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

admin

2020-06-11 6ceb751e2889a5b2910dee806b5c6b2f7653077a

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

@@ -164,7 +164,7 @@
         @Param("type") Integer hbType, @Param("orderState") Integer orderState,

         @Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,  

         @Param("startTime") String startTime, @Param("endTime") String endTime,

         @Param("listSource") List<Integer> listSource, @Param("notBackSuVip") boolean notBackSuVip);

         @Param("listSource") List<Integer> listSource);



   /**

    * 统计各个订单类型 有效个数