Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-07 b18e4004f21e9ec18e2984630888f6626befeb55

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