From 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 590affb..17d7893 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -141,6 +141,32 @@
@Excel(name = "妫�娴嬬粨鏋�")
private String checkResult;
+ /**
+ * 鎵规鍙�
+ */
+ @Excel(name = "鎵规鍙�")
+ private String inspectBatchNo;
+
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String inspectProductModel;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐢熶骇鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate inspectProductionDate;
+
+ /**
+ * 鏈夋晥鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈夋晥鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate inspectValidityDate;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -188,7 +214,7 @@
@TableField(exist = false)
private String purchaseContractNo;
- private String BatchNo;
+ private String batchNo;
private String manufacturingTeam;
/**
--
Gitblit v1.9.3