Merge branch 'dev_yy' into dev

yanweiyuan3

2023-09-22 42f46304bc28d9fb2bee770668b70204d877db93

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