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