diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java index 1b13709..9766e27 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/CommonDataTrans.java @@ -60,9 +60,9 @@ public class CommonDataTrans { @ApiModelProperty("监测项名称") private String trend; private String survItem; - @JsonFormat(timezone = "GMT+8", pattern = "yy.M.d H:m:s") - @DateTimeFormat(pattern = "yy.M.d H:m:s") - @JSONField(format = "yy.M.d H:m:s") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "数据更新时间") @JsonDeserialize(using = LocalDateTimeDeserializer.class) // 反序列化 @JsonSerialize(using = LocalDateTimeSerializer.class) // 序列化