Merge branch 'dev' into xingyy

# Conflicts: # app/components/AppFooter.vue
test
2025-01-08 15:30:34 +08:00 · 2025-01-08 15:30:07 +08:00
1 changed files with 1 additions and 1 deletions
--- a/app/components/AppFooter.vue
+++ b/app/components/AppFooter.vue
@ -23,7 +23,7 @@ const show = computed(() => {
    <van-tabbar-item replace to="/profile">
      <span>{{ $t('tabbar.profile') }}</span>
      <template #icon>
-        <div class="i-carbon:user" />12asdfadas
+        <div class="i-carbon:user" />12asdfasdfasdf
      </template>
    </van-tabbar-item>
  </van-tabbar>
Author	SHA1	Message	Date
xingyy	861ba5118d	Merge branch 'dev' into xingyy # Conflicts: # app/components/AppFooter.vue	2025-01-08 15:30:34 +08:00
xingyy	dd445ece41	test	2025-01-08 15:30:07 +08:00