From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
index f3657e4..8d8254b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
@@ -111,13 +111,13 @@
private Integer parentId;
- @ApiModelProperty("鏁伴噺")
- private Integer quantity;
-
- @ApiModelProperty("鐗规畩鏍囧噯鏂规硶")
- private String specialStandardMethod;
-
@TableField(select = false,exist = false)
private Integer num=1;
+ /**
+ * 鏄惁涓虹啍鎺ユ崯鑰楃壒娈婇」鐢熸垚鐨勬牱鍝佺粍鍚�(0:鍚� 1:鏄�)
+ */
+ @ApiModelProperty("鏄惁涓虹啍鎺ユ崯鑰楃壒娈婇」鐢熸垚鐨勬牱鍝佺粍鍚�(0:鍚� 1:鏄�)")
+ private String isPairing;
+
}
--
Gitblit v1.9.3