Merge branch 'xiaoyang' into dev

wanshenmean

2 天以前 e4921e003cc293fea714bdaf74dc6a6b6b750295

 Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue

@@ -160,14 +160,14 @@
        field: "deviceIp",
        title: "设备IP",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
      },
      {
        field: "devicePort",
        title: "设备端口",
        type: "int",
        width: 120,
        width: 90,
        align: "left",
      },
      {