Merge branch 'dev_cyy'

renhao

2023-10-13 d8483f551bc64f0356e06e9ec32475a84c301364

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