From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMedicalWasteBoxVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMedicalWasteBoxVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMedicalWasteBoxVO.java
index 7d7ca70..b1204a7 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMedicalWasteBoxVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMedicalWasteBoxVO.java
@@ -26,6 +26,9 @@
@ApiModelProperty("暂存间名称")
private String roomName;
+
+ @ApiModelProperty("医废类型")
+ private Long wasteType;
@ApiModelProperty("医废类型名称")
private String wasteTypeStr;
@@ -39,7 +42,10 @@
@ApiModelProperty("重量")
private BigDecimal totalWeight;
- @ApiModelProperty("入库人员")
+ @ApiModelProperty("入库/收集人员")
private String collectUserName;
+ @ApiModelProperty("最后封箱时间")
+ private Date boxTime;
+
}
--
Gitblit v1.7.1