Merge branch 'master' into master_hella
# Conflicts:
# src/views/home/Index copy.vue
# src/views/home/Index2.vue
# src/views/home/components/material.vue
# src/views/home/components/produce.vue
# src/views/home/components/product.vue
# src/views/home/components/supplierIndex.vue
# src/views/home/echarts-data.ts
# src/views/home/index.vue
# src/views/home/types.ts
# src/views/login/components/LoginForm.vue
# src/views/login/components/LoginFormTitle.vue
# src/views/login/components/MobileForm.vue
# src/views/login/components/QrCodeForm.vue
# src/views/login/components/RegisterForm.vue
# src/views/login/components/SSOLogin.vue
# src/views/login/components/index.ts
# src/views/login/components/useLogin.ts
# src/views/login/login.vue
# src/views/profile/components/BasicInfo.vue
# src/views/profile/components/ProfileUser.vue
# src/views/profile/components/ResetPwd.vue
# src/views/profile/components/UserAvatar.vue
# src/views/profile/components/UserSocial.vue
# src/views/profile/components/index.ts
# src/views/profile/index.vue
# src/views/redirect/redirect.vue
|