!90 Merge branch 'develop1.0' into develop_alioo Merge pull request !90 fro...

Alioo

2025-02-24 90ee75b39f2201b7bd3725d4db3fdbd109462519

 zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java

@@ -14,7 +14,7 @@
 * @date 2020-03-25
 */
public interface DailyComprehensiveMapper {
    public List<DailyComprehensive> getDailyComprehensiveList(@Param("nodeId") String nodeId,
    List<DailyComprehensive> getDailyComprehensiveList(@Param("nodeId") String nodeId,
                                                              @Param("dataList") List<DailyComprehensive> dataList,
                                                              @Param("beginTime") Date beginTime,
                                                              @Param("endTime") Date endTime,