Merge branch 'dev_lhj' into dev

hongji.li

2023-09-25 489c4a56c97d4441f54c7b60ede2864681a3620b

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResults/Component_listContextMenuCapacityAllocationResults.def

@@ -1,7 +1,7 @@
Quintiq file version 2.0
Component listContextMenuCapacityAllocationResults
{
  #keys: '[414702.0.338762083]'
  #keys: '[414702.0.390053841]'
  BaseType: 'listContextMenu'
  Properties:
  [