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

lihongji

2024-11-01 dba3b5328e7269c3b0ba8339d6ad32399d1f4352

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def

@@ -27,6 +27,17 @@
        Taborder: 1
      ]
    }
    Component ButtonLockPeriodData
    {
      #keys: '[414996.1.185742569]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'GEAR_VIEW'
        Label: 'Lock period data'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [