From 7dff38876f582644ae95daad8ac21d4f57088d56 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:19:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java
index 03ca3a7..f4815d3 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java
@@ -41,7 +41,7 @@
     private String boxNumber;
 
     @ApiModelProperty("医废类型（数据字典id)")
-    private Integer wasteType;
+    private Long wasteType;
 
     @ApiModelProperty("医废类型名称")
     @ExcelProperty(value = "医废类型", index = 5)

--
Gitblit v1.7.1