From 750fe74ceca55b9fc7764a4b82981072858a570c Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期二, 08 四月 2025 16:16:37 +0800 Subject: [PATCH] Merge branch 'develop1.0' of https://github.com/zhitan-cloud/zhitan-ems into develop1.0 --- zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java index e3a2cbc..b57380c 100644 --- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java +++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java @@ -1,7 +1,6 @@ package com.zhitan.keyequipment.service; -import com.zhitan.common.enums.TimeType; import com.zhitan.keyequipment.domain.MonthlyKeyEquipment; import java.util.Date; @@ -14,6 +13,8 @@ * @date 2021-01-11 */ public interface IMonthlyKeyEquipmentService { - public List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId); - List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId); + + List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId); + + List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId); } -- Gitblit v1.9.3