Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-16 d10671cc1821707c11e466c7a982a6dbfa6442a0

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