Merge branch 'refs/heads/development' into development_new

src/layouts/components/Header/components/Avatar.vue

@@ -38,7 +38,7 @@ import PasswordDialog from "./PasswordDialog.vue";
 import { getMerchantByPhone } from "@/api/modules/homeEntry";
 import { localGet, localSet } from "@/utils/index";
 import { resetRouter } from "@/routers/index";
-import defaultAvatar from "@/assets/images/avatar.gif";
+import defaultAvatar from "@/assets/images/avatar.png";
 import { localClear } from "@/utils";
 
 const router = useRouter();