From e2741d692b5d2e382ae3159a131d54a9ca75aa6f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 10:39:52 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
index c6a2909..90f3bed 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -376,8 +376,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("绾㈠寘鎵ｉ櫎");
--
Gitblit v1.8.0