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

admin

2019-08-28 08d5529087390663115d326190635e4a4997acf2

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java

@@ -474,7 +474,7 @@
               msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);

               msgOther.setTitle("赠送奖励券");

               msgOther.setGiveType("你赠送的奖励券被成功领取");

               msgOther.setReceiveInfo("昵称:  " + userName + " ID:" + uid);

               msgOther.setReceiveInfo("昵称： " + userName + " ID：" + uid);

               msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));

               msgOther.setReceiveTime(sd.format(new Date()));

               userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);

@@ -526,7 +526,7 @@
                  msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);

                  msgOther.setTitle("赠送推广红包");

                  msgOther.setGiveType("你赠送的推广红包被成功领取");

                  msgOther.setReceiveInfo("昵称:  " + userName + " ID:" + uid);

                  msgOther.setReceiveInfo("昵称：" + userName + " ID：" + uid);

                  msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));

                  msgOther.setReceiveTime(sd.format(new Date()));

                  userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);