Merge remote-tracking branch 'origin/master'

tangzy

2021-11-16 3da442cd47a206d0edffb4606d07c305f9d54cd9

 src/store/modules/user.js

@@ -266,7 +266,7 @@
    },
    SET_USER_INFO: (state, userInfo) => {
      if (validatenull(userInfo.avatar)) {
        userInfo.avatar = "/img/bg/img-logo.png";
        userInfo.avatar = "http://223.82.109.183:2081/zhba/upload/picture/mrtx.png";
      }
      state.userInfo = userInfo;
      setStore({ name: 'userInfo', content: state.userInfo })