Merge remote-tracking branch 'origin/master'

liuke

2020-12-11 e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js

@@ -297,7 +297,7 @@
            layer.msg('登录过期', {icon: 2, time: 1500}, function () {
                location.replace('/login.html');
            }, 5000);
        }else if(msg.includes("Invalid access token")){
        }else if(res.msg.includes("Invalid access token")){
            layer.msg('您的账号在其他地方登陆，请重新登录或修改密码', {icon: 2, time: 1500}, function () {
                location.replace('/login.html');
            }, 5000);