From 4ec6c608bcb3d0210c583e376f3bcbe0515b0189 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期五, 21 二月 2025 09:43:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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