Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/java/com/moral/common/util/WebUtils.java

@@ -29,8 +29,12 @@
               params.put(unprefixed, values);

            }

            else {

               if (!ObjectUtils.isEmpty(values[0])) {

                  params.put(unprefixed, values[0]);

               if (!ObjectUtils.isEmpty(values[0]) && !"null".equalsIgnoreCase(values[0])) {

                  if ("sorter".equals(unprefixed)) {

                     params.put(unprefixed, values[0].replace("end", ""));

                  } else {

                     params.put(unprefixed, values[0]);

                  }

               }

            }

         }