Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-02-13 e2dced9dcd39fb53566020c53e131400daac01e6

 zhitan-system/src/main/java/com/zhitan/model/mapper/EnergyIndexMapper.java

@@ -99,5 +99,7 @@

  Page<EnergyIndex> selectEnergyIndexPage(@Param("page")Page<?> page, @Param("query") EnergyIndexQuery energyIndexQuery);

    List<EnergyIndex> getIndexByCode(@Param("code")String code, @Param("nodeId")String nodeId);
  List<EnergyIndex> getIndexByCode(@Param("code")String code, @Param("nodeId")String nodeId);

  List<EnergyIndex> getIndexByMeterIdIndexCode(@Param("meterId") String meterId, @Param("indexCode") String indexCode, @Param("nodeId") String nodeId);
}