From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
index 61d8e22..64d49bb 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
@@ -84,7 +84,7 @@
private Integer inspectionMaterialId;
/**
- * 鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�
+ * 鍏宠仈 鐢ㄦ埛id 鎵ц浜�
**/
private Integer userId;
@@ -92,5 +92,10 @@
* 鍏宠仈 璁惧id
**/
private Integer instrumentId;
+
+ /**
+ * 鍏宠仈 鐢ㄦ埛id 璐ｄ换浜�
+ **/
+ private Integer userProId;
}
--
Gitblit v1.9.3