Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-17 face55e7f35130d29d7f395a4b4501d57b97ef81

 _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 );