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

lihongji

2024-11-11 642ffe272e766efc3fc23f02b324817a94ed6d92

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/Response_pnlActions_btnCancel_OnClick.def

@@ -2,7 +2,7 @@
#parent: pnlActions/btnCancel
Response OnClick () id:Response_pnlActions_btnCancel_OnClick
{
  #keys: '[412672.0.1039310296]'
  #keys: '[414996.1.206961979]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction