Merge remote-tracking branch 'origin/dev' into dev

src/store/modules/user.js

@@ -85,11 +85,11 @@ const user = {
   }
 }
 
-export const logOut = (commit) => {
-  commit('SET_TOKEN', '')
-  commit('SET_ROLES', [])
-  removeToken()
-}
+// export const logOut = (commit) => {
+//   commit('SET_TOKEN', '')
+//   commit('SET_ROLES', [])
+//   removeToken()
+// }
 
 export const setUserInfo = (res, commit) => {
   // 如果没有任何权限，则赋予一个默认的权限，避免请求死循环