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

疯狂的狮子li

2020-10-14 f4876422a997eedad844e757801e31aeb6b8086b

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

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

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