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/energydata/mapper/EnergyDataStatisticMapper.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/energydata/mapper/EnergyDataStatisticMapper.java b/zhitan-system/src/main/java/com/zhitan/energydata/mapper/EnergyDataStatisticMapper.java
index 5a838ef..18f1b28 100644
--- a/zhitan-system/src/main/java/com/zhitan/energydata/mapper/EnergyDataStatisticMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/energydata/mapper/EnergyDataStatisticMapper.java
@@ -1,7 +1,6 @@
package com.zhitan.energydata.mapper;
-import com.zhitan.model.domain.CalcFunction;
-import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -9,5 +8,5 @@
public interface EnergyDataStatisticMapper
{
- List<ModelNodeIndexInfor> getModelNodeIndexIdByFixedNodeIds(@Param("modelCode")String modelCode,@Param("fixedNodeIds") List<String> fixedNodeIds);
+ List<ModelNodeIndexInfo> getModelNodeIndexIdByFixedNodeIds(@Param("modelCode")String modelCode, @Param("fixedNodeIds") List<String> fixedNodeIds);
}
--
Gitblit v1.9.3