Merge branch 'dev' into dev_yy

yanyuan

2023-11-01 c673b37d38537c136cd488b8430146573975d5e3

 _Main/UI/MacroPlannerWebApp/Component_DialogCapacityAllocationResultsRuleConfiguration/Method_New.def

@@ -5,7 +5,7 @@
  #keys: '[414702.0.375317354]'
  Body:
  [*
    capacityAllocationResultsRuleConfiguration := GlobalOTDTable.CapacityAllocationResultsRuleConfiguration( relshadow );
    capacityAllocationResultsRuleConfiguration := GlobalOTDSOP.CapacityAllocationResultsRuleConfiguration( relshadow );
    
    DataHolderDialogData.Data( &capacityAllocationResultsRuleConfiguration );