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

maven

4 天以前 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4

 src/store/modules/user.js

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

            this.currentFactoryName = user.currentFactoryName

            this.nickName = user.nickName

            this.currentDeptId = user.currentDeptId

            resolve(res)

          }).catch(error => {

            reject(error)