From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 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 4472d52..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,9 +4,7 @@
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;
@@ -29,26 +27,18 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鐗╂枡id", example = "152453211563212", required = true)
+ @ApiModelProperty(value = "鐗╂枡id", hidden = true)
+ @TableId(value = "id", type = IdType.AUTO)
private String id;
+
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "152453211563212", required = true)
+ private String code;
@ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "鐭冲ご", required = true)
private String name;
- @ApiModelProperty(value = "渚涘簲鍟�", example = "鐧惧害", required = true)
- private String supplier;
-
- @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�", example = "浠撳簱涓�锛屼簩鍙锋灦", required = true)
- private String location;
-
- @ApiModelProperty(value = "鐗╂枡鏁伴噺", example = "200", required = true)
- private Integer num;
-
- @ApiModelProperty(value = "鎵规", example = "1", required = true)
- private String batch;
-
- @ApiModelProperty(value = "鐩樺彿", example = "152453211563212", required = true)
- 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)
@@ -66,8 +56,4 @@
@ApiModelProperty(value = "涔愯閿�", hidden = true)
private Integer version;
-
- @ApiModelProperty(value = "鍏宠仈 瑙勬牸id", example = "1", required = true)
- private Integer specificationsId;
-
}
--
Gitblit v1.9.3