From 5322edbcc5529864aaea26d78289df7a8a36fb77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 2 +-
1 files changed, 1 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 291a62c..c9d4426 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
@@ -74,7 +74,7 @@
private Integer version;
@ApiModelProperty(value = "鍏宠仈 鎶ユid")
- private String inspectionId;
+ private int inspectionMaterialListId;
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
--
Gitblit v1.9.3