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

xiaoding721

2024-10-14 3e22c533dd00a70f1bb7bb8575b5cb0335551626

 _Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_pHeader.def

@@ -26,12 +26,13 @@
        Taborder: 1
      ]
    }
    Component Button655
    Component bExport
    {
      #keys: '[413988.0.1467011030]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'EXPORT1'
        Taborder: 2
      ]
    }