From 16d63c3d68d131ad0cc4a8bd9f22a0c0515aa6bf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 18:23:57 +0800
Subject: [PATCH] 工时的各需求+检验任务修改
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/StandardProductList.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 73c7a87..79c2d57 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;
/**
* 妫�楠岄」
@@ -59,13 +61,13 @@
* 鍗曚环(鍏�)
*/
@ApiModelProperty("鍗曚环")
- private BigDecimal price;
+ private String price;
/**
* 宸ユ椂(H)
*/
@ApiModelProperty("宸ユ椂")
- private Double manHour;
+ private String manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -178,4 +180,12 @@
private String dic;
private String tree;
+
+ private Integer structureItemParameterId;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被")
+ private String inspectionItemClass;
+
+ @ApiModelProperty(value = "妫�楠岄」鍒嗙被EN")
+ private String inspectionItemClassEn;
}
\ No newline at end of file
--
Gitblit v1.9.3