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

maven

2025-10-20 4243f25a01f4e79b3f83218dfcbe94d9befee43d

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



defineProps({

  collapse: {