From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java b/screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java
index d698262..6c962e5 100644
--- a/screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java
+++ b/screen-job/src/main/java/com/moral/api/entity/SecondCruiserSort.java
@@ -42,7 +42,7 @@
private String time;
- public SecondCruiserSort() {
- this.time =DateUtils.getDateStringOfDay(-1,"yyyy-MM-dd 00:00:00"); // ������������������������������
- }
+/* public SecondCruiserSort() {
+ this.time =DateUtils.getDateStringOfDay(-1,"yyyy-MM-dd HH:00:00"); // ������������������������������
+ }*/
}
--
Gitblit v1.8.0