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

疯狂的狮子li

2020-08-21 d464d8703c8549d5c1b1987f3f5e8711c2c264f7

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


 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java

 ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java

@@ -18,8 +18,8 @@
    /** 排序列 */
    private String orderByColumn;

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

    public String getOrderBy()
    {