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

gaoluyang

2025-07-14 a5f10944640d449e9d70367ca571af5cb2c4ffa2

 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)