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

hongji.li

2023-11-03 aefafd2142478d4fb07d6b8b45c3047e247389e0

 _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:
  [