From 633b96bb1ced95e60df5e28249ce51b6ffe82d27 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 17:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 55d2059..adde7d2 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
@@ -34,15 +34,19 @@
private Integer unitId;
private String unitName;
- /** 宸ュ崟鏉ユ簮 */
+ /** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
private String source;
/**
- * 鐐逛綅
+ * 璁惧缂栧彿
*/
- private Integer pointId;
+ private String serialNumber;
- private String pointTag;
+ private Boolean provinceTag;
+
+ private Boolean importantTag;
+
+ private Boolean importantCommandImageTag;
/**
* 鏄惁閲嶇偣鐐逛綅
@@ -50,8 +54,9 @@
private Boolean important;
/** 鏁呴殰绫诲瀷 */
+ private List<String> errorTypeList;
+ /** 鏁呴殰绫诲瀷 */
private String errorType;
-
/** 杩愮淮浜哄憳 */
private Integer ywPeopleId;
private String ywPeopleName;
@@ -76,9 +81,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date distributeTime;
+ private Date auditTime;
/** 涓嬪彂浜� */
private String realName;
+ /**
+ * 鏄惁鎵ｈ繃绉垎
+ */
+ private Boolean deduct;
public static WorkOrderVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderVO vo) {
if(vo == null) {
vo = new WorkOrderVO();
--
Gitblit v1.8.0