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

Compare commits

base: WxxyDeveloper:075e7eb7c0c753780270110f0f9a508fb133c5a5
Branches Tags
WxxyDeveloper:master
WxxyDeveloper:develop
WxxyDeveloper:feature-zrx
WxxyDeveloper:feature-jie
WxxyDeveloper:feature-xiaolfeng
..
compare: WxxyDeveloper:8c6db3916578d74d53320bcca33b956defc9df03
Branches Tags
WxxyDeveloper:master
WxxyDeveloper:develop
WxxyDeveloper:feature-zrx
WxxyDeveloper:feature-jie
WxxyDeveloper:feature-xiaolfeng

No commits in common. "075e7eb7c0c753780270110f0f9a508fb133c5a5" and "8c6db3916578d74d53320bcca33b956defc9df03" have entirely different histories.
075e7eb7c0 ... 8c6db39165

2 changed files with 3 additions and 8 deletions
Show Stats 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", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dailyTime; private Date dailyTime;
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createdAt; private Date createdAt;
/** /**
* 修改时间 * 修改时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt; private Date updatedAt;
/** /**
* 是否删除 * 是否删除

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

@ -1,7 +1,5 @@
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;
@ -28,13 +26,10 @@ 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;