Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/itdmDevice/ItdmDeviceList.vue

@@ -211,6 +211,11 @@
             dataIndex: 'deviceType'
           },
           {
+            title:'计量有效期',
+            align:"center",
+            dataIndex: 'deviceLife'
+          },
+          {
             title:'维护时间',
             align:"center",
             dataIndex: 'repairTime'