From fb89f40499211dae5d74caf3cea2ea696745e7a2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index 5a51ae9..9ebd49a 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -291,7 +291,7 @@
}
/**
- * ������dateTimeStr���Date������
+ * ������dateTimeStr���Date������ ������������
*
* @param dateTimeStr
* @return
--
Gitblit v1.8.0