Merge branch 'dev'

renhao

2023-10-18 ff1d40a1a235da7c3bdfa26070af267f19c7a3d3

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/Response_ButtonCapacityAndSaleBudgeCompare_OnClick.def

@@ -14,7 +14,7 @@
      info( DataHolderCapacityAndSaleBudgeFilterItem.Data().Size() );
      info( DataHolderCapacityAndSaleBudgeFilterYear.Data().Size() );
      info( DataHolderCapacityAndSaleBudgeFilterMonth.Data().Size() );
      GlobalOTDTable.CapacityAndSaleBudgeCompare( DataHolderMacroPlansForScenarioComparison.Data(), 
      GlobalOTDSOP.CapacityAndSaleBudgeCompare( DataHolderMacroPlansForScenarioComparison.Data(), 
                                                  DataHolderCapacityAndSaleBudgeFilterItem.Data(), 
                                                  DataHolderCapacityAndSaleBudgeFilterYear.Data(), 
                                                  DataHolderCapacityAndSaleBudgeFilterMonth.Data(),