From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001 From: ageerle <ageerle@163.com> Date: 星期一, 21 四月 2025 09:44:09 +0800 Subject: [PATCH] Merge branch 'dev' --- ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 4 ++-- 1 files changed, 2 insertions(+), 2 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 25ab0b3..47808b6 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 @@ -11,7 +11,7 @@ import annotation.idempotent.common.org.ruoyi.RepeatSubmit; import org.ruoyi.common.log.annotation.Log; import org.ruoyi.common.web.core.BaseController; -import org.ruoyi.common.mybatis.core.page.PageQuery; +import org.ruoyi.core.page.PageQuery; import org.ruoyi.common.core.domain.R; import org.ruoyi.common.core.validate.AddGroup; import org.ruoyi.common.core.validate.EditGroup; @@ -21,7 +21,7 @@ import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud || $table.sub) -import org.ruoyi.common.mybatis.core.page.TableDataInfo; +import org.ruoyi.core.page.TableDataInfo; #elseif($table.tree) #end -- Gitblit v1.9.3