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

yujian

2019-08-23 ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b

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

@@ -394,7 +394,7 @@
            // 使用成功消息

            try {

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

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

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

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

               MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

               content.setState("红包扣除");