merge

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvSend.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -13,7 +14,7 @@ import java.util.List;
 
 /**
  * CH_SRV_SEND
- * @author 
+ * @author
  */
 @TableName("CH_SRV_SEND")
 @Data
@@ -100,6 +101,7 @@ public class ChSrvSend implements Serializable {
      * 服务分配终止时间
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date stopTime;
 
     /**
@@ -168,4 +170,4 @@ public class ChSrvSend implements Serializable {
     private String acptLatitude;
 
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SaveStopTime.java

@@ -11,7 +11,6 @@ public class SaveStopTime {
 
     private Long  srvSendId;
 
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date stopTime;
 }