Merge branch 'master' into div

yujian

2019-07-16 b651fb598b4da4ffa734a372e8d1b0b01eeef3fa

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

@@ -2,6 +2,7 @@


import java.math.BigDecimal;



import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;



@@ -168,4 +169,12 @@
    */

   public void rewardCouponAlreadyOutOfDate(UserSystemCoupon coupon);





   /**

    * 淘礼金消息

    * @param uid

    * @param beiZhu

    * @param content

    */

   public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content);

}