From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Product.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 707d80e..7cc9533 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
@@ -31,22 +31,22 @@
@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 = "閾濆寘閽㈣姱閾濈粸绾�")
+ @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;
@@ -60,10 +60,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
- @ApiModelProperty(value = "涔愯閿�", hidden = true)
+ @ApiModelProperty(value = "鐗堟湰", hidden = true)
private Integer version;
- @ApiModelProperty(value = "鍏宠仈 鐗╂枡id", example = "1", hidden = true)
+ @ApiModelProperty(value = "鍏宠仈 鍨嬪彿id", example = "1", hidden = true)
private Integer specifications_id;
--
Gitblit v1.9.3