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/vo/MwApplicationVO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwApplicationVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwApplicationVO.java
index fd1d161..f99dfd9 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwApplicationVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwApplicationVO.java
@@ -21,6 +21,9 @@
private Long departmentId;
@ApiModelProperty("所属区域")
+ private String departmentName;
+
+ @ApiModelProperty("所属区域")
private String region;
@ApiModelProperty("单位类型 1：医疗机构 2：处置单位")
@@ -55,4 +58,7 @@
@ApiModelProperty(value = "申请时间")
private Date createTime;
+
+ @ApiModelProperty("层级关系")
+ private String relation;
}
--
Gitblit v1.7.1