Merge branch 'refs/heads/develop'
All checks were successful
代码检查 / 代码检查 (push) Successful in 18s

This commit is contained in:
筱锋xiao_lfeng 2024-04-20 20:36:18 +08:00
commit 284e388cdd
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
2 changed files with 8 additions and 3 deletions

View File

@ -36,17 +36,17 @@ public class ProjectDailyDO {
/** /**
* 日志发布时间 * 日志发布时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dailyTime; private Date dailyTime;
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createdAt; private Date createdAt;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updatedAt; private Date updatedAt;
/** /**
* 是否删除 * 是否删除

View File

@ -1,5 +1,7 @@
package com.jsl.oa.model.vodata; package com.jsl.oa.model.vodata;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -26,10 +28,13 @@ public class ProjectDailyVO {
private String content; private String content;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
private Date dailyTime; private Date dailyTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
private Date createdAt; private Date createdAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT")
private Date updatedAt; private Date updatedAt;
private Boolean isAllowDelete; private Boolean isAllowDelete;