From f04c1a5a967679b9984926af72be8a3d3f26c2bb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 25 七月 2023 15:44:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index c9d4426..104c16a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -79,5 +79,6 @@
     @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
     private Integer userId;
 
-
+    @ApiModelProperty(value = "鍏宠仈 璁惧id")
+    private Integer instrument_id;
 }

--
Gitblit v1.9.3