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/Specifications.java | 26 +-------------------------
1 files changed, 1 insertions(+), 25 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 5cab1a0..023a593 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
@@ -32,26 +32,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "瑙勬牸缂栧彿", example = "modelId", required = true)
- private String number;
-
@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")
@@ -71,13 +53,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;
+ private Integer standardId;
}
--
Gitblit v1.9.3