Merge branch 'dev_huangjin' into dev

spring

2025-09-01 0b46902b9a7e2a1357e5f6b46edbe3366cb8f785

 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: {