Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-08-07 4e81774a232b45a6a9df3dfd06893c481c83695d

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

@@ -93,6 +93,17 @@
        Taborder: 7
      ]
    }
    Component ButtonScenarioComparisonDemandComparison id:ButtonScenarioComparisonDemandComparison_256
    {
      #keys: '[412672.1.90201789]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EQUALS'
        Label: '需求对比'
        Taborder: 8
      ]
    }
  ]
  Properties:
  [