Merge remote-tracking branch 'origin/dev_tide' into dev_tide

gaoluyang

4 天以前 0a5df5ab2cc2f564ccebb54ec28e0a0b159797bf

 src/layout/components/Sidebar/Logo.vue

@@ -16,7 +16,7 @@
<script setup>

import { ref, computed, onMounted, watch } from 'vue'

import useUserStore from '@/store/modules/user'

import defaultLogo from '@/assets/indexViews/JZYJLogo.png' // 导入默认logo

import defaultLogo from '@/assets/logo/logo.png' // 导入默认logo



defineProps({

  collapse: {