From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
index c1fcdd0..32b2a04 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
@@ -23,21 +23,22 @@
@ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
private Integer id;
+
/**
* 瑙勬牸鍨嬪彿
*/
- @ValueTableShow(value = 2, name = "瑙勬牸鍨嬪彿")
+ @ValueTableShow(value = 3, name = "瑙勬牸鍨嬪彿")
private String model;
/**
* 鏍峰搧鍚嶇О
*/
- @ValueTableShow(value = 3, name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 2, name = "鏍峰搧鍚嶇О")
private String sample;
/**
* 妫�娴嬮」
*/
@ValueTableShow(value = 4, name = "妫�娴嬮」")
- private String inspectionItems;
+ private String inspectionItem;
/**
* 妫�娴嬪瓙椤�
*/
@@ -47,6 +48,7 @@
* 妫�娴嬬粨鏋�
*/
@ValueTableShow(value = 6, name = "妫�娴嬬粨鏋�")
+ @TableField("`last_value`")
private String lastValue;
/**
* 澶勭悊鎰忚
@@ -56,12 +58,12 @@
/**
* 濮旀墭缂栧彿
*/
- @ValueTableShow(value = 8, name = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 1, name = "濮旀墭缂栧彿")
private String entrustCode;
/**
* 鐢ㄦ埛鍚�
*/
- @ValueTableShow(value = 9, name = "鐢ㄦ埛鍚�")
+ @ValueTableShow(value = 9, name = "妫�楠屼汉")
private String name;
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3