diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java index d505baf..6bc4d92 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaFeedbackVo.java @@ -2,11 +2,11 @@ package com.ruoyi.oa.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; -import java.util.Date; +import java.util.Date; /** @@ -17,7 +17,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class OaFeedbackVo { +public class OaFeedbackVo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -70,11 +70,19 @@ public class OaFeedbackVo { */ private String projectCode; - /** * 项目编号 */ private String projectNum; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml index ad5b96b..1c9be1f 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml @@ -44,6 +44,8 @@ oaf.content, oaf.status, oaf.title, + oaf.create_time, + oaf.create_by, oaf.project_id, sop.project_name, sop.project_code,