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

spring

4 天以前 a9600ae56b844289a04e1a7385cf0ccfc384cd08

 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)