From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
index ba54bf8..4df0458 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java
@@ -1,15 +1,12 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
@@ -30,11 +27,8 @@
@ApiModelProperty("妫�楠岄」")
private String inspectionItem;
- /**
- * 妫�楠岄」鍒嗙被
- */
- @ApiModelProperty("妫�楠岄」鍒嗙被")
- private String inspectionItemClassify;
+ @ApiModelProperty("妫�楠岄」EN")
+ private String inspectionItemEn;
/**
* 妫�楠岄」灏忕被
@@ -42,11 +36,17 @@
@ApiModelProperty("妫�楠岄」灏忕被")
private String inspectionItemSubclass;
+ @ApiModelProperty("妫�楠岄」灏忕被EN")
+ private String inspectionItemSubclassEn;
+
/**
* 瀹為獙瀹�
*/
@ApiModelProperty("瀹為獙瀹�")
private String laboratory;
+
+ @ApiModelProperty("瀛愬疄楠屽")
+ private String sonLaboratory;
/**
* 璁￠噺鍗曚綅
@@ -58,13 +58,13 @@
* 鍗曚环(鍏�)
*/
@ApiModelProperty("鍗曚环")
- private BigDecimal price;
+ private String price;
/**
* 宸ユ椂(H)
*/
@ApiModelProperty("宸ユ椂")
- private Integer manHour;
+ private String manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -85,12 +85,6 @@
private String inspectionValueType;
/**
- * 璁惧缁�
- */
- @ApiModelProperty("璁惧缁�")
- private String deviceGroup;
-
- /**
* 妫�楠屾鏁�
*/
@ApiModelProperty("妫�楠屾鏁�")
@@ -103,16 +97,13 @@
private String section;
/**
- * 鍙栧�肩被鍨�
- */
- @ApiModelProperty("鍙栧�肩被鍨�")
- private String valueType;
-
- /**
* 鏂规硶
*/
- @ApiModelProperty("鏂规硶")
+ @ApiModelProperty("鏂规硶鍒楄〃")
private String method;
+
+ @ApiModelProperty("鏂规硶")
+ private String methodS;
/**
* 棰勮鏃堕棿(澶�)
@@ -132,6 +123,9 @@
@ApiModelProperty("瑕佹眰鍊�")
private String ask;
+ @ApiModelProperty("瑕佹眰鎻忚堪")
+ private String tell;
+
/**
* 澶栭敭锛氭爣鍑嗘柟娉昳d
*/
@@ -149,6 +143,9 @@
@ApiModelProperty("鍨嬪彿")
private String model;
+
+ @ApiModelProperty("鍨嬪彿")
+ private Integer templateId;
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
@@ -173,4 +170,13 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ @ApiModelProperty("1锛氭湁鏁� 0锛氭棤鏁�")
+ private Integer state;
+
+ private String dic;
+
+ private String tree;
+
+ private Integer structureItemParameterId;
}
\ No newline at end of file
--
Gitblit v1.9.3