Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-11 e8ba145debbace4e1016d854ccd0a92f3403fd5e

 _var/_Main/ProjSettings/MacroPlannerWebApp/Views/Capacity___sale_budge.vw

@@ -191,10 +191,10 @@
    userconfigurableinformation
    {
    }
    index: 0
    image: 'CHART_HI_LO'
    page: 'ActionBarPageScenarioComparison'
    group: ''
    index: 0
    description: ''
  }
  formatversion: 2