From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:52:19 +0800
Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容

---
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 5a1d810..14177b5 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -8,7 +8,7 @@
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
-import annotation.idempotent.common.org.dromara.RepeatSubmit;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.common.mybatis.core.page.PageQuery;

--
Gitblit v1.9.3