Merge branch 'dev_lhj' into dev

hongji.li

2023-09-25 489c4a56c97d4441f54c7b60ede2864681a3620b

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