From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/common/util/WebUtils.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/common/util/WebUtils.java b/src/main/java/com/moral/common/util/WebUtils.java
index 131ff51..9850b79 100644
--- a/src/main/java/com/moral/common/util/WebUtils.java
+++ b/src/main/java/com/moral/common/util/WebUtils.java
@@ -30,7 +30,11 @@
}
else {
if (!ObjectUtils.isEmpty(values[0]) && !"null".equalsIgnoreCase(values[0])) {
- params.put(unprefixed, values[0]);
+ if ("sorter".equals(unprefixed)) {
+ params.put(unprefixed, values[0].replace("end", ""));
+ } else {
+ params.put(unprefixed, values[0]);
+ }
}
}
}
--
Gitblit v1.8.0