Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/Component_ChartCapacityAndSaleBudgeChart.def

@@ -17,8 +17,8 @@
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'ScenarioManager'
            Source: 'ScenarioManager'
            DataType: 'GlobalOTDTable'
            Source: 'GlobalOTDTable'
            Taborder: 0
            Transformation: 'CapacityAndSaleBudgeChartElement'
          ]
@@ -47,7 +47,7 @@
            }
            WebChartConfigGroup
            {
              Label: 'BusinessTypeOrOrgCode'
              Label: 'BusinessTypeOrPlaceOfProductionOfArray'
              SequenceNr: 1
            }
          }
@@ -62,7 +62,7 @@
            }
            WebChartConfigGroup
            {
              Label: 'BusinessTypeOrOrgCode'
              Label: 'BusinessTypeOrPlaceOfProductionOfArray'
              SequenceNr: 1
            }
            Default: 'Stacked bar'
@@ -70,7 +70,7 @@
            MergeStackedBars: true
          }
        *]
        Groups: 'TimeStringAndScenarioName,BusinessTypeOrOrgCode'
        Groups: 'TimeStringAndScenarioName,BusinessTypeOrPlaceOfProductionOfArray'
        Taborder: 0
      ]
    }