From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 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 10706d8..09d5f51 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,14 @@
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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* 鏍囧噯鏍戜笅鐨勬楠岄」鐩�
@@ -21,8 +20,9 @@
/**
* 涓婚敭id
*/
- @TableId(type = IdType.AUTO)
- private Integer id;
+ @TableId(type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 妫�楠岄」
@@ -30,17 +30,17 @@
@ApiModelProperty("妫�楠岄」")
private String inspectionItem;
- /**
- * 妫�楠岄」鍒嗙被
- */
- @ApiModelProperty("妫�楠岄」鍒嗙被")
- private String inspectionItemClassify;
+ @ApiModelProperty("妫�楠岄」EN")
+ private String inspectionItemEn;
/**
* 妫�楠岄」灏忕被
*/
@ApiModelProperty("妫�楠岄」灏忕被")
private String inspectionItemSubclass;
+
+ @ApiModelProperty("妫�楠岄」灏忕被EN")
+ private String inspectionItemSubclassEn;
/**
* 瀹為獙瀹�
@@ -61,13 +61,13 @@
* 鍗曚环(鍏�)
*/
@ApiModelProperty("鍗曚环")
- private BigDecimal price;
+ private String price;
/**
* 宸ユ椂(H)
*/
@ApiModelProperty("宸ユ椂")
- private Double manHour;
+ private String manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -88,12 +88,6 @@
private String inspectionValueType;
/**
- * 璁惧缁�
- */
- @ApiModelProperty("璁惧缁�")
- private String deviceGroup;
-
- /**
* 妫�楠屾鏁�
*/
@ApiModelProperty("妫�楠屾鏁�")
@@ -106,16 +100,13 @@
private String section;
/**
- * 鍙栧�肩被鍨�
- */
- @ApiModelProperty("鍙栧�肩被鍨�")
- private String valueType;
-
- /**
* 鏂规硶
*/
- @ApiModelProperty("鏂规硶")
+ @ApiModelProperty("鏂规硶鍒楄〃")
private String method;
+
+ @ApiModelProperty("鏂规硶")
+ private String methodS;
/**
* 棰勮鏃堕棿(澶�)
@@ -135,7 +126,7 @@
@ApiModelProperty("瑕佹眰鍊�")
private String ask;
- @ApiModelProperty("瑕佹眰鍊�")
+ @ApiModelProperty("瑕佹眰鎻忚堪")
private String tell;
/**
@@ -185,4 +176,10 @@
@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