Merge branch 'dev_cyy' into dev

hongji.li

2023-09-24 2709b3e28de35a866a65fa72f589d38a43d5045b

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