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/Product.java | 12 +++---------
1 files changed, 3 insertions(+), 9 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..0acfd49 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
@@ -34,16 +34,13 @@
@ApiModelProperty(value = "娴嬭瘯鏍囧噯鍚嶇О", example = "鍗曚綅闀垮害璐ㄩ噺", required = true)
private String name;
- @ApiModelProperty(value = "璇曢獙鏂规硶", example = "--", required = true)
- private String method;
-
@ApiModelProperty(value = "娴嬭瘯鏍囧噯鐖剁被", example = "閾濆寘閽㈣姱閾濈粸绾�")
private String father;
@ApiModelProperty(value = "鍗曚綅", example = "km", required = true)
private String unit;
- @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��", example = "<=0.3458", required = true)
+ @ApiModelProperty(value = "鏍囧噯鍊�", example = "<=0.3458", required = true)
private String required;
@ApiModelProperty(value = "鍐呮帶鍊�", example = "<=0.3458", required = true)
@@ -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