Merge branch 'dev' into dev_yy

yanweiyuan3

2023-09-26 96376f881d2511382f1063242206cff71781ea0b

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Response_ButtonCapacityAndSaleBudgeChartTest_OnClick.def

@@ -13,7 +13,7 @@
      CapacityAndSaleBudgeChartElement::TestData( ScenarioManager );
      
      ScenarioManager.CapacityAndSaleBudgeChart( DataHolderMacroPlansForScenarioComparison.Data(), 
                                                 CheckboxIsCapacity.Checked(),
                                                 DropDownSaleOrCapacity.Text(),
                                                 DropDownTimeGroup.Text(),
                                                 DropDownByBusinessTypeOrByOrgCode.Text(),
                                                 DataHolderCapacityAndSaleBudgeFilterBusinessType.Data(),