chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,10 +1,6 @@
 <template>
  <!-- 布局大小 -->
-  <el-tooltip
-    :content="$t('sizeSelect.tooltip')"
-    effect="dark"
-    placement="bottom"
-  >
+  <el-tooltip :content="$t('sizeSelect.tooltip')" effect="dark" placement="bottom">
    <el-dropdown trigger="click" @command="handleSizeChange">
      <div>
        <svg-icon icon-class="size" />