Merge branch 'develop_16542_system_auth' into 'develop'

Develop 16542 system auth

See merge request !343

project-order/src/main/java/com/dituhui/pea/order/dto/param/Order.java

 package com.dituhui.pea.order.dto.param;
 package com.dituhui.pea.order.dto.param;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
@@ -60,6 +62,8 @@ public class Order {
     /**
     /**
      * 客户期望上门最早时间
      * 客户期望上门最早时间
      */
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expectTimeBegin;
     private Date expectTimeBegin;
 
 
     /**
     /**

project-order/src/main/java/com/dituhui/pea/order/dto/param/OrderConfirmParam.java

 package com.dituhui.pea.order.dto.param;
 package com.dituhui.pea.order.dto.param;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 import java.util.Date;
@@ -21,5 +23,7 @@ public class OrderConfirmParam extends OrderConfirmBaseParam{
     /**
     /**
      * 预约上门时间，预约成功时候填写
      * 预约上门时间，预约成功时候填写
      */
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date appointmentTime;
     private Date appointmentTime;
 }
 }