Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

hongji.li

2023-10-17 6989e1184317c28b715514e6b601c587faa654a0

 _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
  }