From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 10:03:17 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index e85eded..597277b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -119,7 +119,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date distributeTime;
- private Date auditTime;
/** 涓嬪彂浜� */
private String realName;
@@ -127,6 +126,12 @@
* 鏄惁鎵ｈ繃绉垎
*/
private Boolean deduct;
+ //澶勭悊鏃堕棿鐐归泦鍚�
+ private List<Date> handleTimeList;
+ private Date handleTime;
+ //瀹℃牳鏃堕棿鐐归泦鍚�
+ private List<Date> auditTimeList;
+ private Date auditTime;
public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
--
Gitblit v1.8.0