Merge branch 'master' into dev

admin-web/src/views/admin/ordering/index.vue

@@ -281,6 +281,7 @@ const state = reactive({
       // {label: '站点ID',  prop: 'stationId',width:100, resizable: true, fixed: 'left'},
       // {label: '站点', prop: 'stationName', width: 150, resizable: true, fixed: 'left'},
       {label: '充电订单号', prop: 'startChargeSeq', width: 170, resizable: true, fixed: 'left'},
+      {label: '设备编号', prop: 'shortId', width: 90, resizable: true},
       {label: '充电设备接口编码', prop: 'connectorId', width: 160, resizable: true},
       {label: '充电开始/结束时间', prop: 'startTime', sortable: 'custom', width: 175, resizable: true},
       // {label: '充电结束时间', prop: 'endTime', sortable: 'custom', width: 160, resizable: true},