From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 12 二月 2025 14:15:40 +0800
Subject: [PATCH] 解决冲突
---
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