From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
index 2e7abb0..ad0aeb2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
@@ -25,8 +25,8 @@
private Integer workOrderId;
/** 鎻愪氦浜� */
- private Integer commitUser;
- private String commitUserName;
+ private Integer unitId;
+ private String unitName;
/** 杩愮淮鎯呭喌 */
private String ywCondition;
@@ -34,6 +34,9 @@
/** 浣愯瘉鏉愭枡 */
private String ywProofMaterials;
+ /** 鏄惁绯荤粺娑堟伅 */
+ private Boolean sysMsg;
+
public static WorkOrderYwConditionRecordVO getVoByEntity(@NonNull WorkOrderYwConditionRecord entity, WorkOrderYwConditionRecordVO vo) {
if(vo == null) {
vo = new WorkOrderYwConditionRecordVO();
--
Gitblit v1.8.0