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

lihongji

2024-10-17 0dc9f85a5442956570399722b5636387942ff827

1
2
3
4
5
6
7
8
Quintiq file version 2.0
#root
#parent: MacroPlanner
OrphanComponent GlobalStateMacroPlanner
{
  #keys: '[119640.1.1203465130]'
  BaseType: 'GlobalState'
}