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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

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

@@ -260,4 +260,12 @@
    */

   public void systemGiveRewardCoupon(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto);



   /**

    * 淘礼金兑换成金币消息

    * @param uid

    * @param beiZhu

    * @param dto

    */

   public void taoLiJinExchangeMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO msgOther);



}