From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 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