From 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 17:00:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/store/modules/user.js | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ba555bc..2dd2797 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -50,7 +50,9 @@
this.id = user.userId
this.name = user.userName
this.avatar = avatar
+ this.currentFactoryName = user.currentFactoryName
this.nickName = user.nickName
+ this.currentDeptId = user.currentDeptId
resolve(res)
}).catch(error => {
reject(error)
@@ -87,7 +89,7 @@
loginCheckFactory(userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
- const factoryId = userInfo.factoryId
+ const factoryId = userInfo.currentFatoryId
return new Promise((resolve, reject) => {
loginCheckFactory(username, password, factoryId).then(res => {
setToken(res.token)
--
Gitblit v1.9.3