From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Material.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 9eee171..e94e131 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
@@ -11,6 +11,7 @@
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* <p>
@@ -20,6 +21,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Accessors(chain = true)
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Material瀵硅薄", description="")
@@ -29,15 +31,15 @@
@ApiModelProperty(value = "鐗╂枡id", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
- private String id;
+ private Integer id;
- @ApiModelProperty(value = "鐗╂枡缂栫爜", example = "152453211563212", required = true)
+ @ApiModelProperty(value = "鐗╂枡缂栫爜", hidden = true)
private String code;
@ApiModelProperty(value = "鐗╂枡鍚嶇О", example = "鐭冲ご", required = true)
private String name;
- @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧", example = "1", required = true)
+ @ApiModelProperty(value = "0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱", example = "1")
private Integer type;
@TableLogic(value = "1", delval = "0")
--
Gitblit v1.9.3