From 0a8119461bea9b913819d302b8820f1dc2cf420c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 07 一月 2025 17:07:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/dto/CollectDto.java |    1 +
 1 files changed, 1 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 afdbb77..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
@@ -26,5 +26,6 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date receiveTime;
     private String wasteTypeStr;
+    private String departmentName;
 
 }

--
Gitblit v1.7.1