From 330f90fe25f054ddcdec4c3ce037ea1ea851be72 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodVerify.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodVerify.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodVerify.java
index 693471b..fbe7fdb 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodVerify.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/ProcessMethodVerify.java
@@ -5,6 +5,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -25,6 +26,18 @@
@Schema(description = "鏍囧噯鏂规硶")
private String methodName;
+
+ @Schema(description = "鏂规硶楠岃瘉鐨勬爣鍑嗗悕绉�")
+ private String standardName;
+
+ @Schema(description = "鏂规硶楠岃瘉鐨勬爣鍑嗙紪鍙�")
+ private String standardCode;
+
+ @Schema(description = "鏂规硶楠岃瘉鐨勯獙璇侀」鐩�")
+ private String verifyItem;
+
+ @Schema(description = "鏂规硶楠岃瘉琛ㄦ牸鍐呭锛孞SON")
+ private String verificationContent;
@Schema(description = "楠岃瘉鍘熷洜")
private String verifyReason;
@@ -104,6 +117,36 @@
@Schema(description = "(鍏朵粬)澶囨敞")
private String otherRemark;
+ @Schema(description = "鏁版嵁澶勭悊")
+ private String dataProcessing;
+
+ @Schema(description = "璐ㄩ噺鎺у埗鏂规硶")
+ private String qualityControlMethod;
+
+ @Schema(description = "鏂规硶缁撴灉楠岃瘉")
+ private String methodResultVerification;
+
+ @Schema(description = "楠岃瘉缁撹")
+ private String verificationConclusion;
+
+ @Schema(description = "璇勫鎰忚-缁撹(鍚屾剰浣跨敤/涓嶈兘浣跨敤/闄愬埗浣跨敤)")
+ private String reviewResult;
+
+ @Schema(description = "璇勫鎰忚-璇勫浜哄憳")
+ private String reviewPerson;
+
+ @Schema(description = "璇勫鎰忚-鏃ユ湡")
+ private LocalDate reviewDate;
+
+ @Schema(description = "瀹℃壒鎰忚-缁撹(鍚屾剰浣跨敤/涓嶈兘浣跨敤/闄愬埗浣跨敤)")
+ private String approvalResult;
+
+ @Schema(description = "瀹℃壒鎰忚-鎶�鏈礋璐ｄ汉")
+ private String approvalPerson;
+
+ @Schema(description = "瀹℃壒鎰忚-鏃ユ湡")
+ private LocalDate approvalDate;
+
@Schema(description = "纭鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime confirmDate;
--
Gitblit v1.9.3