合并冲突

licp

2024-08-09 c146c0ae4e57b26e798157fe453426e9fc26db34

 src/view/enter.vue

@@ -183,7 +183,8 @@
                     localStorage.setItem('user', JSON.stringify({
                       account: this.ruleForm.account,
                       password: this.ruleForm.pwd,
                       name: res.data.name
                       name: res.data.name,
                userId: res.data.userId
                     }))
              sessionStorage.setItem('token', res.data.token)
              sessionStorage.setItem('reToken', res.data.reToken)