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

xiaoding721

2024-11-06 2c714b2284a68fbe764bbd11dd23e74d42d83f34

 _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
      ]
    }