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/DepartmentReportVO.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/DepartmentReportVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/DepartmentReportVO.java index a41fe57..0218d18 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/DepartmentReportVO.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/DepartmentReportVO.java @@ -9,6 +9,12 @@ @Data @ApiModel("医院报表视图对象") public class DepartmentReportVO { + + @ApiModelProperty("机构名称") + private String departmentName; + + @ApiModelProperty("设备名称") + private String equipmentName; @ApiModelProperty("类别") private List<String> legend; -- Gitblit v1.7.1