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

lihongji

2024-10-12 f1de76007e7834e17d87712e3342efd84876c200

 _Main/UI/MacroPlannerWebApp/Component_DialogSynchronizeStartingInventory/_ROOT_Component_DialogSynchronizeStartingInventory.def

@@ -16,7 +16,7 @@
    EnterButton: 'btnOk'
    EscapeButton: 'btnCancel'
    ExcludeFromActiveComponent: true
    MinimumRows: 30
    MinimumColumns: 30
    Padding: 'false'
    Title: 'Synchronize Starting Inventory'
  ]