Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def

@@ -23,10 +23,53 @@
      Properties:
      [
        Image: 'PIG'
        Taborder: 1
        Taborder: 5
        Title: '年度产销复盘'
      ]
    }
    Component mnPanelPullingMaterialOperationsOfEachBusinessUnit
    {
      #keys: '[414702.1.5481991]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'BANANA'
        Taborder: 1
        Title: '面板拉料_事业部操作'
      ]
    }
    Component mnPanelPullingMaterialGroupOperations
    {
      #keys: '[414702.1.5522564]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'CLIENT_NETWORK'
        Taborder: 2
        Title: '面板拉料_集团操作'
      ]
    }
    Component mn224
    {
      #keys: '[414702.1.5593849]'
      BaseType: 'WebMenu'
      Properties:
      [
        Separator: true
        Taborder: 4
      ]
    }
    Component mnDockingERPForPRRelease
    {
      #keys: '[414702.1.5920760]'
      BaseType: 'WebMenu'
      Properties:
      [
        Image: 'BEER_GLASS'
        Taborder: 3
        Title: '对接ERP进行PR释放'
      ]
    }
  ]
  Properties:
  [