From 1f5ef3a86b1227f49c6840b2205174e4ab2f0f14 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 15:49:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
index 133d435..29e4edc 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java
@@ -25,5 +25,7 @@
@ApiModelProperty("接收时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date receiveTime;
+ private String wasteTypeStr;
+ private String departmentName;
}
--
Gitblit v1.7.1