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

lihongji

2024-11-11 642ffe272e766efc3fc23f02b324817a94ed6d92

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Component_pnlActions.def

@@ -1,13 +1,13 @@
Quintiq file version 2.0
Component pnlActions
{
  #keys: '[412672.0.1039310286]'
  #keys: '[414996.1.206961981]'
  BaseType: 'WebPanel'
  Children:
  [
    Component btnOk
    {
      #keys: '[412672.0.1039310290]'
      #keys: '[414996.1.206961982]'
      BaseType: 'WebButton'
      Properties:
      [
@@ -17,7 +17,7 @@
    }
    Component btnCancel
    {
      #keys: '[412672.0.1039310292]'
      #keys: '[414996.1.206961983]'
      BaseType: 'WebButton'
      Properties:
      [