diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue
index 9bc3347..cd766b9 100644
--- 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: {}
   }
   
diff --git a/src/views/lowdesign/reportDesign/designData.ts b/src/views/lowdesign/reportDesign/designData.ts
index be077b0..43a9e61 100644
--- a/src/views/lowdesign/reportDesign/designData.ts
+++ b/src/views/lowdesign/reportDesign/designData.ts
@@ -196,11 +196,11 @@ for (const key in infoColumn) {
 //默认值
 const infoDefaultData = {
   basics: {
-<<<<<<< HEAD
-    fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '',isHideCol:'N', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '',isHideDimension:'', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
-=======
+
+    // fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '',isHideCol:'N', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '',isHideDimension:'', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
+
     fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', isFixedColumn: 'N', fixedColumnValue: '', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '', isDynamicGroup: 'N', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
->>>>>>> zh
+
   },
 }