From 76e4e7941771d29141a285b6673ae3a89e9a543d Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 12 七月 2023 16:05:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
index ad3c9c3..9db06ce 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
@@ -86,11 +86,11 @@
/**
*当巡检周期是小时的时候为必填
*/
- private Date workStartTime;
+ private String workStartTime;
/**
*当巡检周期是小时的时候为必填
*/
- private Date workEndTime;
+ private String workEndTime;
/**
*工作日类型(每天：0；法定工作日(除法定
* 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
--
Gitblit v1.9.2