From 302a7aa2b0a5324111cfa49cf71a2deba7a1a0d9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 17:32:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN

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

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/TotalCollectWeightByTypeVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/TotalCollectWeightByTypeVO.java
index c976e20..8de7c93 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/TotalCollectWeightByTypeVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/TotalCollectWeightByTypeVO.java
@@ -20,7 +20,7 @@
     private List<String> dateList;
 
     @ApiModelProperty("医废类型列表")
-    private List<String> wasteTypeList = new ArrayList<>();
+    private List<SysDictDataVO> wasteTypeList = new ArrayList<>();
 
     @ApiModelProperty("各日期各类型医废收集总量列表")
     private List<List<BigDecimal>> totalCollectWeightList = new ArrayList<>();

--
Gitblit v1.7.1