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

rk

8 小时以前 4898564fb2510dcdbe10d01eaa94886512aebc77

 admin/src/components/common/CommonHeader.vue

@@ -270,8 +270,9 @@
          newPwd: this.changePwdData.form.newPwd
        })
          .then(() => {
            console.log('修改成功')
            this.$tip.apiSuccess('修改成功')
            this.$store.commit('setUserInfo', { needChangePwd: 1 })
            // this.$store.commit('setUserInfo', { needChangePwd: 1 })
            this.visible.changePwd = false
          })
          .catch(e => {