Merge branch 'dev_cyy' into dev

hongji.li

2023-09-25 ba242ea6059e616daab92156e08f27dd2cf9f8a8

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