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

spring

3 天以前 fd3e3b19aaf23c4f68d8b98d514499510b152e39

 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.tenantId

            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)