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

lihongji

2024-11-19 ad71a09dddf7033ba80b7277ea091205457ac1b1

 _Main/UI/MacroPlannerWebApp/Component_DialogAttributeConfiguration/_ROOT_Component_DialogAttributeConfiguration.def

@@ -16,6 +16,7 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumColumns: 100
    Padding: 'false'
    Title: 'Attribute configuration'
  ]