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

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

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

@@ -108,5 +108,9 @@
    * @return

    */

   public long countCouponNum(Long uid, Integer state, Integer activated, List<String> list, List<String> listSource);



   public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay, String source);



   public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay, String source);

   

}