From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
index fcf0006..14a985e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java
@@ -27,29 +27,26 @@
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 = "娴嬭瘯鏍囧噯鍚嶇О", example = "鍗曚綅闀垮害璐ㄩ噺", required = true)
+ @ApiModelProperty(value = "椤圭洰鍚嶇О", example = "閾濆寘閽㈣姱閾濈粸绾�", required = true)
private String name;
- @ApiModelProperty(value = "璇曢獙鏂规硶", example = "--", required = true)
- private String method;
-
- @ApiModelProperty(value = "娴嬭瘯鏍囧噯鐖剁被", example = "閾濆寘閽㈣姱閾濈粸绾�")
+ @ApiModelProperty(value = "椤圭洰鐖剁被", example = "鍗曚綅闀垮害璐ㄩ噺")
private String father;
- @ApiModelProperty(value = "鍗曚綅", example = "km", required = true)
+ @ApiModelProperty(value = "鍗曚綅", example = "km")
private String unit;
- @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��", example = "<=0.3458", required = true)
+ @ApiModelProperty(value = "鏍囧噯鍊�", example = "<=0.3458")
private String required;
- @ApiModelProperty(value = "鍐呮帶鍊�", example = "<=0.3458", required = true)
+ @ApiModelProperty(value = "鍐呮帶鍊�", example = "<=0.3458")
private String internal;
- @TableLogic(value = "1", delval = "0")
+
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
@@ -66,11 +63,8 @@
@ApiModelProperty(value = "涔愯閿�", hidden = true)
private Integer version;
- @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id", hidden = true)
- private Integer userId;
-
- @ApiModelProperty(value = "鍏宠仈 鐗╂枡id", example = "152453211563212", required = true)
- private String materialId;
+ @ApiModelProperty(value = "鍏宠仈 鍨嬪彿id", example = "1", hidden = true)
+ private Integer specifications_id;
}
--
Gitblit v1.9.3