Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def

@@ -27,6 +27,28 @@
        Taborder: 1
      ]
    }
    Component ButtonLockPeriodData
    {
      #keys: '[414996.1.185742569]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'GEAR_VIEW'
        Label: 'Lock period data'
        Taborder: 2
      ]
    }
    Component ButtonMaintainArchivedFiles
    {
      #keys: '[414996.1.213680180]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'DOCUMENTS_GEAR'
        Label: 'Maintain archived files'
        Taborder: 3
      ]
    }
  ]
  Properties:
  [