From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java
index 2a7885b..8e429a4 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java
@@ -72,7 +72,7 @@
//������������������content
String[] contentArray = content.split(";");
List<String> contentList = Arrays.asList(contentArray);
- String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd");
+ String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd HH:mm:ss");
vo.setAccount(account);
vo.setContent(contentList);
--
Gitblit v1.8.0