Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web

# Conflicts: # src/views/lowdesign/reportDesign/index.vue
1231
2026-03-12 13:58:48 +08:00 · 2026-03-12 13:57:37 +08:00
2 changed files with 6 additions and 2 deletions
--- a/src/views/lowdesign/reportDesign/index.vue
+++ b/src/views/lowdesign/reportDesign/index.vue
@@ -354,6 +354,10 @@ 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>
Author	SHA1	Message	Date
chy	89b3c978c5	Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_web # Conflicts: # src/views/lowdesign/reportDesign/index.vue	2026-03-12 13:58:48 +08:00
chy	ccfb06113a	1231	2026-03-12 13:57:37 +08:00