Merge branch 'dev' into dev_yy

yanweiyuan3

2023-09-26 96376f881d2511382f1063242206cff71781ea0b

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