diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
index 83bf2ea..af65122 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
@@ -103,15 +103,19 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
 //                return false;
 //            }
 
+
+
+
             UserApp userApp = new UserApp();
             userApp.setUserId(userInfo.getId());
             userApp = userAppService.queryUserApp(userApp);
-            if (!requestToken.equals(userApp.getToken())) {
+            //TODO 去掉设备登录注释
+           /* if (!requestToken.equals(userApp.getToken())) {
                 Result<Object> result = new Result<>();
                 result.setCode(ResultCode.NOT_TOKEN).setMessage("您在其他设备中登录");
                 ComUtil.responseResult(response, result);
                 return false;
-            }
+            }*/
 
             if (StringUtils.isNotBlank(merchantCode) && "staff".equals(userApp.getUserType())) {
                 MerchantStaffConn staffConn = new MerchantStaffConn().setMerchantCode(merchantCode);
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
index be59519..17cafd5 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
@@ -377,7 +377,11 @@ public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, Us
         // 获取当前用户的详情信息来判断用户的登陆类型
         UserApp queryUserApp = new UserApp().setUserId(checkUserInfo.getId());
         queryUserApp = userAppMapper.selectOne(new QueryWrapper<>(queryUserApp));
-        String genRandomNum = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+
+        // TODO 去掉该用户只能登录一个设备
+        //String genRandomNum = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+        String genRandomNum = loginName;
+
         UserApp uApp = new UserApp();
         uApp.setToken(genRandomNum);
         uApp.setId(queryUserApp.getId());