From 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 18 七月 2024 18:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
index ffa4801..745d38b 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/pojo/AuxiliaryOutputWorkingHours.java
@@ -32,10 +32,20 @@
@ExcelIgnore
private Integer id;
- @ApiModelProperty("妫�娴嬮」鐩�")
- @ExcelProperty(value = "妫�娴嬮」鐩�")
+ @ApiModelProperty("妫�娴嬬埗椤�")
+ @ExcelProperty(value = "妫�娴嬬埗椤�")
@ValueTableShow(2)
- private String inspectProject;
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�娴嬪瓙椤�")
+ @ExcelProperty(value = "妫�娴嬪瓙椤�")
+ @ValueTableShow(2)
+ private String inspectionItemSubclass;
+
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ @ExcelProperty(value = "鏍峰搧缂栧彿")
+ @ValueTableShow(2)
+ private String sample;
@ApiModelProperty("鍔犵彮濮旀墭鍗曞彿")
@ExcelProperty(value = "鍔犵彮濮旀墭鍗曞彿")
--
Gitblit v1.9.3