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

admin

2019-08-27 d440fc97a7061447fe44ae333e86b29357439104

 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java

@@ -213,4 +213,15 @@
    */

   public void outOfDate(UserSystemCoupon coupon, MsgTypeOtherTypeEnum type);



   /**

    * 免单券正在使用

    * 
    * @param source

    * @param startTime

    * @param endTime

    */

   public void couponUsingFreeSheet(UserSystemCoupon coupon,String orderId,BigDecimal money, MsgTypeOtherTypeEnum type);

	
   public void couponUsedFreeSheet(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type);



}