设备列表导出优化

device-manager-ui/admin/src/views/device/list.vue

@@ -327,7 +327,7 @@ export default {
 
           { label: "设备编码", prop: "deviceCode" },
 
-          { label: "mac地址", prop: "deviceMac" },
+          // { label: "mac地址", prop: "deviceMac" },
 
           {
             label: "设备生产商",
@@ -350,11 +350,11 @@ export default {
             formatter: this.changeStatus,
           },
 
-          // {
-          //   label: "最近上线时间",
-          //   prop: "onlineTime",
-          //   formatter: this.formatterDate,
-          // },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            formatter: this.formatterDate,
+          },
 
           // { label: "激活状态", prop: "active", formatter: this.formatterYES },
           {

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -146,7 +146,7 @@ public class DeviceApiController {
             RegisterResp registerResp = new RegisterResp();
             registerResp.setRabbmitInfo(authInfo);
             ServerInfo serverInfo = new ServerInfo();
-            serverInfo.setHomeUrl(productEntity.getHomeUrl());
+            serverInfo.setHomeUrl(productEntity.getHomeUrl()==null?"":productEntity.getHomeUrl());
             serverInfo.setServerUrl(platformEntity.getSendUrl());
             registerResp.setServiceInfo(serverInfo);
             DeviceInfo deviceInfo = new DeviceInfo();