From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
index 56d0026..def7e4d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
@@ -12,6 +12,7 @@
import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
/**
* <p>
@@ -22,38 +23,22 @@
* @since 2023-07-11
*/
@Data
+@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Specifications瀵硅薄", description="瑙勬牸")
public class Specifications implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "瑙勬牸id", hidden = true)
+ @ApiModelProperty(value = "鍨嬪彿id", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "瑙勬牸id", example = "modelId", required = true)
- private String number;
-
- @ApiModelProperty(value = "浜у搧瑙勬牸鍚嶇О", example = "AB", required = true)
+ @ApiModelProperty(value = "浜у搧鍨嬪彿鍚嶇О", example = "AB", required = true)
private String name;
- @ApiModelProperty(value = "鐢熶骇鎸囦护鍙�", example = "test", required = true)
- private String instruct;
-
- @ApiModelProperty(value = "鐢靛帇绛夌骇", example = "test", required = true)
- private String voltageLevel;
-
- @ApiModelProperty(value = "涓荤嚎蹇冩埅闈�", example = "test", required = true)
- private String crossSection;
-
- @ApiModelProperty(value = "涓荤嚎鑺姱鏁�", example = "test", required = true)
- private String numberOfCores;
-
- @ApiModelProperty(value = "瑙勬牸鐘舵�� 0锛氬仠鐢紱1锛氭甯革紱-1锛氳崏绋�", hidden = true)
- private Integer spe_state;
-
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
@@ -70,13 +55,7 @@
@Version
private Integer version;
- @ApiModelProperty(value = "鍏宠仈瀛楁 鍨嬪彿id", hidden = true)
- private String vel;
-
- @ApiModelProperty(value = "鍏宠仈瀛楁 鍨嬪彿id", example = "230711000002", required = true)
- private String serialId;
-
- @ApiModelProperty(value = "鍏宠仈瀛楁 鐢ㄦ埛id", hidden = true)
- private Integer userId;
+ @ApiModelProperty(value = "鍏宠仈瀛楁 瑙勬牸id", hidden = true)
+ private Integer standardId;
}
--
Gitblit v1.9.3