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

疯狂的狮子li

2020-09-25 6101a3bf0d3f7e8de375a0b9bfa7ce71a111144c

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -22,7 +22,7 @@
    private String token;

    /**
     * 登陆时间
     * 登录时间
     */
    private Long loginTime;