lyhzzz 4 months ago
parent
commit
94af4266e8

+ 5 - 2
src/main/java/com/fdkankan/manage/entity/AuthorizeRtk.java

@@ -15,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.common.CustomDateConverter;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -151,12 +152,14 @@ public class AuthorizeRtk implements Serializable {
     @TableField("valid_day")
     private String validDay;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("valid_start_time")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ExcelProperty(value = "差分账号期限开始时间",index = 18)
     private Date validStartTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("valid_end_time")
     @ExcelProperty(value = "差分账号期限结束时间",index = 19)
     private Date validEndTime;

+ 3 - 2
src/main/java/com/fdkankan/manage/entity/RtkDevice.java

@@ -8,6 +8,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -103,11 +104,11 @@ public class RtkDevice implements Serializable {
     @TableField(exist = false)
     private String createNickName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("valid_start_time")
     private Date validStartTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("valid_end_time")
     private Date validEndTime;
 }