From 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 17:42:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwCollectRecordVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 d92148d..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
@@ -1,6 +1,6 @@
 package com.sinata.system.domain.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
+import cn.idev.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,7 +41,7 @@
     private String boxNumber;
 
     @ApiModelProperty("医废类型（数据字典id)")
-    private Integer wasteType;
+    private Long wasteType;
 
     @ApiModelProperty("医废类型名称")
     @ExcelProperty(value = "医废类型", index = 5)

--
Gitblit v1.7.1