diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
index aaa69884d..606faf0f2 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
@@ -51,6 +51,7 @@ public class EquRepairWorkOrder extends BaseEntity {
     private String workFaultDesc;
 
     private String orderDesc;//故障描述
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;//报修时间
 
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index ea1c90909..12ddffb0a 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
@@ -1574,7 +1574,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     public AjaxResult updateWorkCostTime() {
         //查询
         EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
-        equRepairWorkOrder.setWorkCostTime("-");
+//        equRepairWorkOrder.setWorkCostTime("-");
         List<EquRepairWorkOrder> list = equRepairWorkOrderMapper.selectEquRepairWorkOrderList(equRepairWorkOrder);
         int i ;
         int sum =0;