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

yaowanxin

22 小时以前 c0207243208de40cf191e18e3e4326993c4d72d7

 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/WDSYLogo.png' // 导入默认logo

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



defineProps({

  collapse: {

@@ -126,4 +126,4 @@
    }

  }

}

</style>
</style>