From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
index b362524..dca2648 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
@@ -27,7 +27,7 @@
 
     @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value = "id", hidden = true)
-    private Integer id;
+    private int id;
 
     @ApiModelProperty(value = "materialId")
     private String materialId;

--
Gitblit v1.9.3