Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-25 4269bd7e29b525a0e97e7283d2688e26df87b9f2

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_ListCapacityAllocationResultsRuleConfiguration_MenuGenerateByPeggin.def

@@ -16,7 +16,7 @@
  {
    Body:
    [*
      CapacityAllocationResults::Test1( MacroPlan, GlobalOTDTable, selection );
      CapacityAllocationResults::Test1( MacroPlan, GlobalOTDSOP, selection );
    *]
    GroupServerCalls: false
  }