Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-19 4c31405418bdd063605f1e5821d99f85be02f23c

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java

@@ -375,7 +375,7 @@
            

            // 使用成功消息

            try {

               String beizhu = "未被领取/使用的部分将会退回";

               String beizhu = "未被领取或领取后未使用部分退回";

               SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");

               String time = sd.format(new Date());

               MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();