Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev

疯狂的狮子Li

2021-08-18 b19111b9bffe99f65ac08a85d40bb2f186dd264a

 ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -92,7 +92,7 @@
        Page<T> page = new Page<>(pageNum, pageSize);
        if (StringUtils.isNotBlank(orderByColumn)) {
            String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
         orderBy = StringUtils.toUnderlineCase(orderBy);
         orderBy = StringUtils.toUnderScoreCase(orderBy);
         if ("asc".equals(isAsc)) {
                page.addOrder(OrderItem.asc(orderBy));
            } else if ("desc".equals(isAsc)) {