diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index 6ee64c6..bb522f5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -207,6 +207,7 @@
     @TableField(exist = false)
     private String ledgerName;
 
+    @ExcelProperty(value = "标签", order = 18)
     @ApiModelProperty("闸井标签")
     @TableField(exist = false)
     private String marker;

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index 6ee64c6..bb522f5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -207,6 +207,7 @@
     @TableField(exist = false)
     private String ledgerName;
 
+    @ExcelProperty(value = "标签", order = 18)
     @ApiModelProperty("闸井标签")
     @TableField(exist = false)
     private String marker;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index d080a2b..352c721 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -92,6 +92,8 @@
             busDevice.setValidName(abstractDictService.getDictNameByCode("useStatus", busDevice.getValid()));
             busDevice.setBfztName(abstractDictService.getDictNameByCode("bfzt", busDevice.getBfzt()));
             busDevice.setOnlineState("0".equals(busDevice.getOnlineState()) ? "离线" : "在线");
+            //设备标签,用作一网统管标签了
+            busDevice.setRemarks(busDevice.getMarker());
             if (ObjectUtil.isNotEmpty(busDevice.getDeptid()))
                 busDevice.setDeptName(commonServer.getDeptNamesByDeptId(busDevice.getDeptid()));
             if (ObjectUtil.isNotEmpty(busDevice.getLedgerId()))
@@ -652,7 +654,7 @@
         UpdateWrapper<BusDevice> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("DEVCODE", devcode);
         updateWrapper.set("LOGTIME", new Date());
-        updateWrapper.set("ONLINE_STATE",DictEnum.DEVICE_FAILURE);
+        updateWrapper.set("ONLINE_STATE", DictEnum.DEVICE_FAILURE);
         return this.update(updateWrapper);
     }
 }