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

lihongji

2024-08-04 fb1634fb000c80a7b66d3af521c964dea9923d79

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