Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev

admin

2025-01-22 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def

@@ -150,17 +150,6 @@
        Taborder: 11
      ]
    }
    Component ButtonCustomerDemandPPAIDS
    {
      #keys: '[415136.0.1123430252]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'FLAG_AMBER'
        Label: '客户需求(PPA + IDS)'
        Taborder: 12
      ]
    }
  ]
  Properties:
  [