From bb39e81c92ac5ec4e089d8f3384981813188f39e Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 29 十月 2024 17:15:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java index de84219..02a487f 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/service/DaPointService.java @@ -1,9 +1,10 @@ package com.iailab.module.data.point.service; import com.iailab.framework.common.pojo.PageResult; +import com.iailab.module.data.common.utils.PageUtils; import com.iailab.module.data.point.dto.DaPointDTO; import com.iailab.module.data.point.entity.DaPointEntity; -import com.iailab.module.data.point.vo.DaPointPageReqVO; +import com.iailab.module.data.point.vo.*; import java.util.List; import java.util.Map; @@ -54,4 +55,7 @@ void updateDefaultValue(DaPointDTO dto); + PointImportRespVO importPointList(List<PointImportExcelVO> importPoints, boolean isUpdateSupport); + + PageResult<DaPointEntity> queryExcelList(DaPointPageReqVO exportReqVO); } -- Gitblit v1.9.3