From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
index 6d360a9..4d1bec6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/vo/MesQcOqcRespVO.java
@@ -127,7 +127,7 @@
@Schema(description = "妫�娴嬬粨鏋�", example = "1")
@ExcelProperty(value = "妫�娴嬬粨鏋�", converter = DictConvert.class)
- @DictFormat(DictTypeConstants.MES_QC_CHECK_RESULT)
+ @DictFormat(DictTypeConstants.MES_OQC_CHECK_RESULT)
private Integer checkResult;
// ========== 妫�楠岄」鎸囨爣 ==========
@@ -160,6 +160,29 @@
@ExcelProperty("澶囨敞")
private String remark;
+ // ========== 鎶ュ憡琛ㄥご涓庣瀛� ==========
+
+ @Schema(description = "閲囨牱鍦扮偣", example = "缃愬尯")
+ private String samplingLocation;
+
+ @Schema(description = "璇佷功缂栧彿/鍚堟牸璇佸彿", example = "V0028")
+ private String certificateNo;
+
+ @Schema(description = "鎵ц鏍囧噯", example = "GB/T6027")
+ private String executeStandard;
+
+ @Schema(description = "澶嶆牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long auditUserId;
+
+ @Schema(description = "澶嶆牳浜烘樀绉�", example = "鏉庡洓")
+ private String auditNickname;
+
+ @Schema(description = "瀹℃牳浜虹敤鎴风紪鍙�", example = "1")
+ private Long approveUserId;
+
+ @Schema(description = "瀹℃牳浜烘樀绉�", example = "鐜嬩簲")
+ private String approveNickname;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍒涘缓鏃堕棿")
private LocalDateTime createTime;
--
Gitblit v1.9.3