From 2b8767a3b089e8b69d2dd59795593b096ea699a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 17:57:58 +0800
Subject: [PATCH] 8-28 bug修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
index 3a20172..f4150b1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
@@ -22,48 +22,47 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="RawMaterial瀵硅薄", description="")
+@ApiModel(value = "RawMaterial瀵硅薄", description = "")
public class RawMaterial implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�", required = true, example = "姹熻嫃榈烽洀")
private String supplierName;
- @ApiModelProperty(value = "鏉愭枡缂栫爜")
+ @ApiModelProperty(value = "鏉愭枡缂栫爜", required = true, example = "YCL202308290000002")
private String materialCoding;
- @ApiModelProperty(value = "鏉愭枡鍚嶇О")
+ @ApiModelProperty(value = "鏉愭枡鍚嶇О", required = true, example = "鍏夌氦")
private String materialName;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿", required = true, example = "GGXH2023")
private String specificationsModels;
- @ApiModelProperty(value = "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅", required = true, example = "KB")
private String unit;
- @ApiModelProperty(value = "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺", example = "100", required = true)
private Integer quantity;
- @ApiModelProperty(value = "鎶ユ鏃ユ湡")
+ @ApiModelProperty(value = "鎶ユ鏃ユ湡", example = "2023-08-29", required = true, dataType = "date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private LocalDateTime inspectionDate;
+ private Date inspectionDate;
- @ApiModelProperty(value = "妫�楠屼汉")
+ @ApiModelProperty(value = "妫�楠屼汉", example = "鏉庡崕", required = true)
private String surveyor;
- @ApiModelProperty(value = "妫�楠屾棩鏈�")
+ @ApiModelProperty(value = "妫�楠屾棩鏈�", required = true, example = "2023-08-29", dataType = "date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private LocalDateTime dateSurvey;
+ private Date dateSurvey;
- @ApiModelProperty(value = "鐘舵��")
- private Integer condition;
+ @ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�", required = true, example = "1")
+ private Integer type;
- @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
@@ -73,8 +72,8 @@
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "涔愯閿�", hidden = true)
--
Gitblit v1.9.3