Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-10-12 f1de76007e7834e17d87712e3342efd84876c200

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