Merge remote-tracking branch 'origin/master'

src/main/java/org/sss/presentation/noui/jwt/TokenInterceptor.java

@@ -82,7 +82,7 @@ public class TokenInterceptor implements HandlerInterceptor {
 		}
 
 		// 重新刷入登陆时间
-		RedisLoginInfo nweRedisLoginInfo = new RedisLoginInfo(userId, token, NumericUtil.sessionTimeOut(), redisLoginInfo.getSysmod(),terminalType);
+		RedisLoginInfo nweRedisLoginInfo = new RedisLoginInfo(userId, token, NumericUtil.sessionTimeOut(), redisLoginInfo.getSysmod(),noUiRequest.getTerminalType());
 		RedisUtil.set(Constants.SESSION + "." + userId + "." + terminalType, nweRedisLoginInfo);
 		return true;