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/vo/EimsInspectStVo.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsInspectStVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsInspectStVo.java
index 66703cd..d07b824 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsInspectStVo.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsInspectStVo.java
@@ -2,6 +2,7 @@
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
@@ -58,6 +59,7 @@
* 璁″垝鏃堕棿
*/
@ExcelProperty(value = "璁″垝鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date planTime;
private String planTimeStr;
@@ -97,6 +99,18 @@
private String specialNote;
/**
+ * 杩愯鏃堕棿
+ */
+ @ExcelProperty(value = "杩愯鏃堕棿")
+ private Integer runTimes;
+
+ /**
+ * 鏁呴殰鏃堕棿
+ */
+ @ExcelProperty(value = "鏁呴殰鏃堕棿")
+ private Integer faultTimes;
+
+ /**
* 澶囨敞
*/
@ExcelProperty(value = "澶囨敞")
@@ -123,6 +137,8 @@
*/
private Integer abNormalNum;
+ private String stId;
+
--
Gitblit v1.9.3