From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 18:08:13 +0800
Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 2843604..d39542d 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
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.annotation.*;
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.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -19,8 +20,9 @@
/**
* 涓婚敭id
*/
- @TableId(type = IdType.AUTO)
- private Integer id;
+ @TableId(type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
/**
* 妫�楠岄」
@@ -28,11 +30,17 @@
@ApiModelProperty("妫�楠岄」")
private String inspectionItem;
+ @ApiModelProperty("妫�楠岄」EN")
+ private String inspectionItemEn;
+
/**
* 妫�楠岄」灏忕被
*/
@ApiModelProperty("妫�楠岄」灏忕被")
private String inspectionItemSubclass;
+
+ @ApiModelProperty("妫�楠岄」灏忕被EN")
+ private String inspectionItemSubclassEn;
/**
* 瀹為獙瀹�
@@ -53,13 +61,13 @@
* 鍗曚环(鍏�)
*/
@ApiModelProperty("鍗曚环")
- private BigDecimal price;
+ private String price;
/**
* 宸ユ椂(H)
*/
@ApiModelProperty("宸ユ椂")
- private Double manHour;
+ private String manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -80,12 +88,6 @@
private String inspectionValueType;
/**
- * 璁惧缁�
- */
- @ApiModelProperty("璁惧缁�")
- private String deviceGroup;
-
- /**
* 妫�楠屾鏁�
*/
@ApiModelProperty("妫�楠屾鏁�")
@@ -96,12 +98,6 @@
*/
@ApiModelProperty("鍖洪棿")
private String section;
-
- /**
- * 鍙栧�肩被鍨�
- */
- @ApiModelProperty("鍙栧�肩被鍨�")
- private String valueType;
/**
* 鏂规硶
@@ -130,7 +126,7 @@
@ApiModelProperty("瑕佹眰鍊�")
private String ask;
- @ApiModelProperty("瑕佹眰鍊�")
+ @ApiModelProperty("瑕佹眰鎻忚堪")
private String tell;
/**
@@ -182,4 +178,9 @@
private Integer state;
private String dic;
+
+ private String tree;
+
+ @TableField(exist = false,select = false)
+ private Integer structureItemParameterId;
}
\ No newline at end of file
--
Gitblit v1.9.3