From cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 13 三月 2021 19:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java
index f09357c..84f3640 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/SortUtil.java
@@ -26,10 +26,10 @@
page.setCurrent(request.getPageNum());
page.setSize(request.getPageSize());
String sortField = request.getField();
- if (camelToUnderscore) {
- sortField = FebsUtil.camelToUnderscore(sortField);
- defaultSort = FebsUtil.camelToUnderscore(defaultSort);
- }
+ // if (camelToUnderscore) {
+ // sortField = FebsUtil.camelToUnderscore(sortField);
+ // defaultSort = FebsUtil.camelToUnderscore(defaultSort);
+ // }
if (StringUtils.isNotBlank(request.getField())
&& StringUtils.isNotBlank(request.getOrder())
&& !StringUtils.equalsIgnoreCase(request.getField(), "null")
--
Gitblit v1.8.0