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

lihongji

2024-11-11 a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c

1
2
3
4
5
6
7
Quintiq file version 2.0
#parent: #root
Attribute GenericResourceId
{
  #keys: '3[142408.0.629613320][142408.0.629613319][142408.0.629613321]'
  ValueType: String
}