From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 17 十一月 2023 16:45:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- mes-basic/src/main/java/com/chinaztt/mes/basic/service/ParamService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/ParamService.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/ParamService.java index d7fd783..789e5fd 100644 --- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/ParamService.java +++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/ParamService.java @@ -21,12 +21,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaztt.mes.basic.dto.ParamPlusDto; import com.chinaztt.mes.basic.entity.Param; import com.chinaztt.mes.basic.excel.ParamData; -import com.chinaztt.mes.basic.dto.ParamPlusDto; +import com.chinaztt.mes.common.util.easyexcel.template.ParamTemplate; import com.chinaztt.ztt.common.core.util.R; -import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -89,4 +89,5 @@ */ String checkItemRepeat(Param param); + void importExcelPlus(List<ParamTemplate> paramTemplates); } -- Gitblit v1.9.3