From 1a02af0b9943a11e2c8ab4e8665939437a7fbf16 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 03 八月 2024 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index a0f694d..059ef59 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,9 +27,14 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ValueTableShow(value = 1, name = "鏍峰搧缂栧彿")
+ @TableField(exist = false,select = false)
+ private String sampleCode;
+
/**
* 妫�楠岄」
*/
+ @ValueTableShow(value = 2, name = "妫�楠岄」")
private String inspectionItem;
private String inspectionItemEn;
@@ -45,6 +51,7 @@
/**
* 妫�楠岄」瀛愮被
*/
+ @ValueTableShow(value = 2, name = "妫�楠岄」瀛愮被")
private String inspectionItemSubclass;
private String inspectionItemSubclassEn;
@@ -62,16 +69,19 @@
/**
* 鏍峰搧鍒嗙被
*/
+ @ValueTableShow(value = 3, name = "鏍峰搧鍒嗙被")
private String sampleType;
/**
* 鏍峰搧
*/
+ @ValueTableShow(value = 4, name = "鏍峰搧")
private String sample;
/**
* 鍨嬪彿
*/
+ @ValueTableShow(value = 5, name = "鍨嬪彿")
private String model;
private String methodS;
@@ -79,6 +89,7 @@
/**
* 瀛愬疄楠屽
*/
+ @ValueTableShow(value = 6, name = "璇曢獙瀹�")
private String sonLaboratory;
/**
@@ -137,7 +148,7 @@
private String method;
/**
- * 棰勮鏃堕棿(澶�)
+ * 棰勮鏃堕棿(h)
*/
private Integer manDay;
@@ -149,11 +160,13 @@
/**
* 瑕佹眰鍊�
*/
+ @ValueTableShow(value = 7, name = "瑕佹眰鍊�")
private String ask;
/**
* 瑕佹眰鎻忚堪
*/
+ @ValueTableShow(value = 8, name = "瑕佹眰鎻忚堪")
private String tell;
/**
--
Gitblit v1.9.3