Merge branch 'dev_yy' into dev

yanyuan

2023-09-06 efb7b5c7ee8424268f48a168e7f5b869030d3a9b

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