Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

Kevin Kok Khah Whey

2023-10-18 d5e46a7a9f2cb9123b9aafb39a20e14059faa2e4

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def

@@ -23,7 +23,7 @@
      Properties:
      [
        Image: 'PIG'
        Taborder: 5
        Taborder: 6
        Title: '年度产销复盘'
      ]
    }
@@ -56,7 +56,7 @@
      Properties:
      [
        Separator: true
        Taborder: 4
        Taborder: 5
      ]
    }
    Component mnDockingERPForPRRelease
@@ -70,6 +70,17 @@
        Title: '对接ERP进行PR释放'
      ]
    }
    Component mnDataDistribution
    {
      #keys: '[414702.1.155392180]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'PALM_TREE'
        Taborder: 4
        Title: '数据分发'
      ]
    }
  ]
  Properties:
  [