From 9b2837d4b844099f3b7536065ada857b136c1c92 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 十二月 2024 15:29:12 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java
index 1314ce1..2fe6315 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardTemplate.java
@@ -29,14 +29,14 @@
* 妯℃澘鍚嶇О
*/
@ApiModelProperty("妯℃澘鍚嶇О")
- @ValueTableShow(1)
+ @ValueTableShow(2)
private String name;
/**
* 澶囨敞
*/
@ApiModelProperty("澶囨敞")
- @ValueTableShow(2)
+ @ValueTableShow(3)
private String remark;
/**
@@ -52,7 +52,7 @@
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(4)
+ @ValueTableShow(5)
private LocalDateTime createTime;
/**
*
@@ -65,16 +65,23 @@
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(6)
+ @ValueTableShow(7)
private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓鐢ㄦ埛")
- @ValueTableShow(3)
+ @ValueTableShow(4)
@TableField(exist = false)
private String createUserName;
@ApiModelProperty("鏇存柊鐢ㄦ埛")
- @ValueTableShow(5)
+ @ValueTableShow(6)
@TableField(exist = false)
private String updateUserName;
+
+ /**
+ * 妯℃澘缂栧彿
+ */
+ @ApiModelProperty("妯℃澘缂栧彿")
+ @ValueTableShow(1)
+ private String number;
}
\ No newline at end of file
--
Gitblit v1.9.3