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/QmBatchVo.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmBatchVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmBatchVo.java
index 4d3132f..ce8136f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmBatchVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/qm/domain/vo/QmBatchVo.java
@@ -2,6 +2,8 @@
import java.util.Date;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
import org.dromara.qa.qm.domain.QmBatch;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -59,8 +61,15 @@
/**
* 鐗屽彿
*/
- @ExcelProperty(value = "鐗屽彿")
+ @ExcelProperty(value = "鐗屽彿code")
private String matCode;
+
+ /**
+ * 鐗屽彿
+ */
+ @ExcelProperty(value = "鐗屽彿")
+ @Translation(type = TransConstant.MAT_CODE_TO_NAME, mapper = "matCode")
+ private String matName;
/**
* 鍒ゅ畾渚濇嵁浠ｇ爜
@@ -68,6 +77,10 @@
@ExcelProperty(value = "鍒ゅ畾渚濇嵁浠ｇ爜")
private String judgeCode;
+ @ExcelProperty(value = "鍒ゅ畾渚濇嵁")
+ @Translation(type = TransConstant.JUDGE_CODE_TO_NAME, mapper = "judgeCode")
+ private String judgeName;
+
/**
* 鎵规鐢熸垚鏃ユ湡
*/
--
Gitblit v1.9.3