WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: 目标模块所有查询接口' (#40) from feature-zrx into develop

Browse Source 
Reviewed-on: #40
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
This commit is contained in:
筱锋xiao_lfeng 2024-04-20 20:36:03 +08:00
commit 075e7eb7c0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsl/oa/model/dodata/ProjectDailyDO.java
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;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
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;
/**
* 是否删除

5
src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
View File

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