121

2026-03-12 14:01:28 +08:00
parent 89b3c978c5
commit 4260e35018
1 changed files with 0 additions and 4 deletions
--- a/src/views/lowdesign/reportDesign/index.vue
+++ b/src/views/lowdesign/reportDesign/index.vue
@@ -354,10 +354,6 @@ const tableFormVerify = (type) => {
        let tabKey = 'mysql'
        // 子字段不能再包含子字段
        if (item.isSubField && item.hasChildren === 'Y') {
-<<<<<<< HEAD
-          
-=======
->>>>>>> e33fcb33fe4b8f77c8e4cfa9784af83018966c04
          messageText = `<div style="line-height:24px">
              <div>子字段不能包含子字段</div>
              <div>序号：${index + 1}</div>