From e97b55310155a2dd691bd698a10295a4d867f60c Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 17 四月 2026 15:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmJudgeDetailsVo.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmJudgeDetailsVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmJudgeDetailsVo.java
index f005ed1..9829c65 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmJudgeDetailsVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmJudgeDetailsVo.java
@@ -11,7 +11,7 @@
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
-
+import java.util.List;
/**
@@ -27,6 +27,8 @@
@Serial
private static final long serialVersionUID = 1L;
+
+ private String id;
/**
* 鍒ゅ畾涓绘爣璇�
@@ -50,19 +52,19 @@
* 鏍囧噯鍊�
*/
@ExcelProperty(value = "鏍囧噯鍊�")
- private Long value3;
+ private Double value3;
/**
* 鍒ゅ畾鍊�1
*/
@ExcelProperty(value = "鍒ゅ畾鍊�1")
- private Long value1;
+ private Double value1;
/**
* 鍒ゅ畾鍊�2
*/
@ExcelProperty(value = "鍒ゅ畾鍊�2")
- private Long value2;
+ private Double value2;
/**
* 缂洪櫡浣嶇疆
@@ -80,7 +82,7 @@
* 鍒嗗�兼爣鍑� (鎵ｅ垎鏍囧噯锛屽緱鍒嗘爣鍑�),姣斿涓嶅悎鏍间竴娆℃墸澶氬皯鍒�
*/
@ExcelProperty(value = "鍒嗗�兼爣鍑� (鎵ｅ垎鏍囧噯锛屽緱鍒嗘爣鍑�),姣斿涓嶅悎鏍间竴娆℃墸澶氬皯鍒�")
- private Long stdscore;
+ private Double stdscore;
/**
* 鏍囪姝ら」鏄惁涓哄悎鎴愰」鐩紝姣斿澶栬锛屽疄闄呬笂鍏宠仈浜嗗緢澶氬瓙椤圭洰
@@ -113,4 +115,46 @@
private String updateUser;
+ /**
+ * 瀛愭壒娆＄爜
+ */
+ @ExcelProperty(value = "瀛愭壒娆＄爜")
+ private String subBatchCode;
+
+ /**
+ * 涓嶈壇鍊�
+ */
+ @ExcelProperty(value = "涓嶈壇鍊�")
+ private Long badVal;
+
+ /**
+ * 鎵规鐮�
+ */
+ @ExcelProperty(value = "鎵规鐮�")
+ private String batchCode;
+
+ /**
+ * 鐗╂枡鐮�
+ */
+ @ExcelProperty(value = "鐗╂枡鐮�")
+ private String matCode;
+
+ /**
+ * 璁惧
+ */
+ @ExcelProperty(value = "璁惧")
+ private String eqp;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ExcelProperty(value = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ /**
+ * 瀛愰」鍒楄〃锛堢敤浜庢爲褰㈢粨鏋勶級
+ */
+ private List<QmJudgeDetailsVo> children;
+
+
}
--
Gitblit v1.9.3