From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwMedicalWasteBoxVO.java | 15 ++++++++++++++-
1 files changed, 14 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..2dc25a5 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
@@ -1,8 +1,10 @@
package com.sinata.system.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -26,6 +28,9 @@
@ApiModelProperty("暂存间名称")
private String roomName;
+
+ @ApiModelProperty("医废类型")
+ private Long wasteType;
@ApiModelProperty("医废类型名称")
private String wasteTypeStr;
@@ -39,7 +44,15 @@
@ApiModelProperty("重量")
private BigDecimal totalWeight;
- @ApiModelProperty("入库人员")
+ @ApiModelProperty("入库/收集人员")
private String collectUserName;
+ @ApiModelProperty("最后封箱时间")
+ private Date boxTime;
+
+ @ApiModelProperty(value = "运输日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date transitDate;
+
}
--
Gitblit v1.7.1