解决冲突

2026-02-12 09:32:15 +08:00
parent e7dd16454c
commit aa853f539b
2 changed files with 4 additions and 7 deletions
--- a/src/components/LowDesign/src/LowReport/index.vue
+++ b/src/components/LowDesign/src/LowReport/index.vue
@@ -191,10 +191,7 @@ const initTable = async () => {
    border: reportVo.tableConfig.includes('border'),
    stripe: reportVo.tableConfig.includes('stripe'),
    showSummary:false,
-<<<<<<< HEAD
    stripe:true,
-=======
->>>>>>> zh
    column: {}
  }