Merge branch 'dev' into dev_yy

yanweiyuan3

2023-09-21 765e7ec8426f896bf78a8749e38bd1656ca05474

 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialVehicle/_ROOT_Component_FormPanelMaterialVehicle.def

@@ -29,6 +29,17 @@
        Taborder: 0
      ]
    }
    Component ButtonFusionData
    {
      #keys: '[414702.0.212142601]'
      BaseType: 'WebButton'
      Properties:
      [
        Image: 'COOLING_TOWER'
        Label: '融合数据'
        Taborder: 2
      ]
    }
  ]
  Properties:
  [