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

lihongji

2024-11-01 dba3b5328e7269c3b0ba8339d6ad32399d1f4352

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateLockPeriod/_ROOT_Component_DialogCreateLockPeriod.def

@@ -16,6 +16,9 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    Image: 'LOCK'
    MinimumColumns: 70
    Padding: 'false'
    Title: '设置锁定期'
  ]
}