出库时间，激活时间

src/main/java/com/fdkankan/manage/entity/Camera.java

@@ -1,10 +1,12 @@
 package com.fdkankan.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -34,7 +36,8 @@ public class Camera implements Serializable {
      * 激活时间
      */
     @TableField("activated_time")
-    private String activatedTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date activatedTime;
 
     /**
      * 相机密码

src/main/java/com/fdkankan/manage/entity/CameraDetail.java

@@ -1,10 +1,12 @@
 package com.fdkankan.manage.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -129,7 +131,8 @@ public class CameraDetail implements Serializable {
      * 出库时间
      */
     @TableField("out_time")
-    private String outTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date outTime;
 
     /**
      * 记录的状态，A: 生效，I: 禁用

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -131,7 +131,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             camera.setChildName(res[1]);
             camera.setWifiPassword(CameraConstant.WIFI_PASSWORD_VALUE);
             camera.setChildPassword(CameraConstant.CHILD_PASSWORD_VALUE);
-            camera.setActivatedTime(DateUtil.date2String(new Date(),DateUtil.DEFAULT_DATE_FORMAT));
+            camera.setActivatedTime(new Date());
             cameraList.add(camera);
 
         }
@@ -161,7 +161,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
                 cameraDetail.setCountry(2);
                 cameraDetail.setOwn(2);
-                cameraDetail.setOutTime(Dateutils.getDate(new Date()));
+                cameraDetail.setOutTime(new Date());
             }
             cameraDetailList.add(cameraDetail);
         }
@@ -301,7 +301,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setOrderSn(param.getOrderSn());
             cameraDetail.setOwn(param.getOutType());
             cameraDetail.setCompanyId(param.getCompanyId());
-            cameraDetail.setOutTime(Dateutils.getDate(new Date()));
+            cameraDetail.setOutTime(new Date());
             cameraDetails.add(cameraDetail);
         }
         return cameraDetailService.saveOrUpdateBatch(cameraDetails) ? cameraDetails.size() : 0;