From e03b2546f020327bf9fd414d8869a9ccd2270c2d Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期二, 17 六月 2025 17:31:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev
---
src/store/modules/user.js | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ba555bc..5623661 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -50,6 +50,7 @@
this.id = user.userId
this.name = user.userName
this.avatar = avatar
+ this.currentFactoryName = user.currentFactoryName
this.nickName = user.nickName
resolve(res)
}).catch(error => {
@@ -87,7 +88,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