Merge branch 'dev' into master_tuzuo

data-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {