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

maven

3 天以前 7f9b99a28cd983fa55b5788519682e4794cf6cb0

 src/store/modules/user.js

@@ -52,7 +52,7 @@
            this.avatar = avatar

            this.currentFactoryName = user.currentFactoryName

            this.nickName = user.nickName

            this.currentDeptId = user.currentDeptId

            this.currentDeptId = user.tenantId

            resolve(res)

          }).catch(error => {

            reject(error)