From 664192da0b746cc064a3b9b992083eb7b68253e9 Mon Sep 17 00:00:00 2001
From: Ricky <hk_ricky@163.com>
Date: Thu, 25 Nov 2021 15:18:02 +0800
Subject: [PATCH] 升级velocity到最新版本2.3（语法升级）
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 3c26de5..5b450cb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -57,7 +57,8 @@
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
{
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- PageHelper.startPage(pageNum, pageSize, orderBy);
+ Boolean reasonable = pageDomain.getReasonable();
+ PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
}
}
--
Gitblit v1.9.2