Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Conflicts: ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
2020-08-21 13:01:12 +08:00 · 2020-08-21 13:01:12 +08:00 · d464d8703c
parent 1b82822d15 0446d211df
commit d464d8703c
1 changed files with 2 additions and 2 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
@ -18,8 +18,8 @@ public class PageDomain
    /** 排序列 */
    private String orderByColumn;

-    /** 排序的方向 "desc" 或者 "asc". */
-    private String isAsc;
+    /** 排序的方向desc或者asc */
+    private String isAsc = "asc";

    public String getOrderBy()
    {