Merge branch 'develop1.0' into zhangjw_from_develop1.0

z1415143022

2025-03-25 75f9894ebac12b13c7ead27c3e16db833ee9251a

 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);
}