From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java
index 62f5f62..2ca3b8e 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java
@@ -9,12 +9,13 @@
import java.util.List;
/**
- *閲嶇偣璁惧鑳借�楃粺璁� 骞�
+ * 閲嶇偣璁惧鑳借�楃粺璁� 骞�
*
* @author sys
* @date 2021-01-11
*/
public interface IYearKeyEquipmentService {
- public List<YearKeyEquipment> getYearKeyEquipmentList(List<String> indexIds, List<TypeTime> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
+ List<YearKeyEquipment> getYearKeyEquipmentList(List<String> indexIds, List<TypeTime> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
+
List<YearKeyEquipment> getListChart(DataItemQueryDTO queryDto);
}
--
Gitblit v1.9.3