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

张诺

5 天以前 11e1de7bb345bc937cce53a2ac7672476b5b4db3

 src/views/equipmentManagement/measurementEquipment/index.vue

@@ -82,6 +82,12 @@
    minWidth:150,
    align:"center"
   },
  {
    label: "计量器具名称",
    prop: "name",
    width: '160px',
    align: "center",
  },
   {
      label: "安装位置",
      prop: "instationLocation",