From 733cad83ed9a5fdc459aa7bf715edd6bd4862f12 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期四, 20 三月 2025 21:21:57 +0800
Subject: [PATCH] Merge pull request #17 from Andy-Yin/zt_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java
index ca9a75c..15af3ff 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java
@@ -1,6 +1,5 @@
package com.zhitan.comprehensivestatistics.mapper;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.MonthlyComprehensive;
import org.apache.ibatis.annotations.Param;
@@ -29,7 +28,7 @@
@Param("dataList") List<MonthlyComprehensive> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
/**
@@ -45,7 +44,7 @@
List<MonthlyComprehensive> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
}
--
Gitblit v1.9.3