From 20c644e44d92fa02b873fb6189eee71615bc12d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
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