From cdaff9ab0d1b676e3b429171d6de0887c98f488c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:15:31 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-26标准库修改前
---
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
index 7641c02..9eee171 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java
@@ -4,12 +4,11 @@
import java.io.Serializable;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,26 +27,18 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鐗╂枡id")
+ @ApiModelProperty(value = "鐗╂枡id", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
private String id;
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "152453211563212", required = true)
+ private String code;
+
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "鐭冲ご", required = true)
private String name;
- @ApiModelProperty(value = "渚涘簲鍟�")
- private String supplier;
-
- @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�")
- private String location;
-
- @ApiModelProperty(value = "鐗╂枡鏁伴噺")
- private Integer num;
-
- @ApiModelProperty(value = "鎵规")
- private String batch;
-
- @ApiModelProperty(value = "鐩樺彿")
- private String reelNumber;
+ @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧", example = "1", required = true)
+ private Integer type;
@TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
@@ -63,10 +54,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
+ @ApiModelProperty(value = "涔愯閿�", hidden = true)
private Integer version;
-
- @ApiModelProperty(value = "鍏宠仈 瑙勬牸id")
- private Integer specificationsId;
-
-
}
--
Gitblit v1.9.3