From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionEquipmentVO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionEquipmentVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionEquipmentVO.java
index add5930..eb713d4 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionEquipmentVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/MwProtectionEquipmentVO.java
@@ -27,7 +27,7 @@
     private Long protectionEquipmentType;
 
     @ApiModelProperty("器具类型名称")
-    private Long protectionEquipmentTypeStr;
+    private String protectionEquipmentTypeStr;
 
     @ApiModelProperty("器具名称")
     private String equipmentName;
@@ -40,4 +40,7 @@
 
     @ApiModelProperty("附件列表")
     private List<MwAttachmentVO> attachmentList;
+
+    @ApiModelProperty("层级关系")
+    private String relation;
 }

--
Gitblit v1.7.1