Merge branch 'dev_yy' into dev

yanyuan

2023-09-06 d741e529a05597074596281f999c5c82f18f1363

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