From b7b10f78abc7ba462e5c602ba7e70d4739e316b8 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 24 六月 2025 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsRepairResBo.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsRepairResBo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsRepairResBo.java
index 2ab96cc..c800bf5 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsRepairResBo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/bo/EimsRepairResBo.java
@@ -10,6 +10,8 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
/**
@@ -32,7 +34,6 @@
/**
* 鎶ヤ慨鍗昳d
*/
- @NotNull(message = "鎶ヤ慨鍗曚笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long reqId;
private Long reqUser;//鎶ヤ慨浜�
@@ -42,19 +43,16 @@
/**
* 缁翠慨鍗曞彿
*/
- @NotNull(message = "鎶ヤ慨鍗曠紪鍙蜂笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private String resCode;
/**
* 缁翠慨浜�
*/
- @NotNull(message = "缁翠慨浜轰笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long resUser;
/**
* 缁翠慨浜洪儴闂�
*/
- @NotNull(message = "缁翠慨浜洪儴闂ㄤ笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long resDept;
/**
@@ -76,13 +74,11 @@
/**
* 缁翠慨鐘舵��(瀛楀吀)
*/
- @NotBlank(message = "缁翠慨鐘舵��(瀛楀吀)涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private String status;
/**
* 寮�濮嬫椂闂�
*/
- @NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Date startTime;
/**
@@ -106,6 +102,12 @@
private String remark;
+ /**
+ * 璇勪环id
+ */
+ private Long fbId;
+
+
//杈呭姪瀛楁
/**
* 闇�瑕佹壒閲忔坊鍔犵殑鎶ヤ慨鍗曞彿
@@ -115,8 +117,16 @@
// 鍏宠仈琛ㄥ瓧娈�
private String reqCode;//鎶ヤ慨鍗曠紪鐮�
+ private String reqType;//鎶ヤ慨鍗曠被鍨�
+ private String assetNo;//璁惧璧勪骇缂栧彿
+ private Long equId;
+
+
+ private String statusLt;
+
+ private List<EimsSpareBo> spareParts;
--
Gitblit v1.9.3