Merge remote-tracking branch 'origin/developer' into developerC

src/layout/components/Sidebar/Logo.vue

@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       title: '采美后台',
-      logo: '/favicon.svg'
+      logo: '/favicon.ico'
     }
   }
 }