Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

8 天以前 8b531e76e1f957d67069aa7ab0e8c5a9a747c06e

 src/views/equipmentManagement/measurementEquipment/index.vue

@@ -82,14 +82,8 @@
    align:"center"
   },
   {
      label: "部门",
      prop: "deptName",
      width: 130,
    align:"center"
   },
   {
      label: "安装位置",
      prop: "installationLocation",
      prop: "instationLocation",
      width: 150,
    align:"center"
   },