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 6bc4d92..8df1f63 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 @@ -17,7 +17,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -public class OaFeedbackVo extends BaseEntity { +public class OaFeedbackVo { private static final long serialVersionUID = 1L; diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml index 1c9be1f..891695c 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaFeedbackMapper.xml @@ -65,9 +65,10 @@ oaf.project_id, sop.project_name, sop.project_code, - sop.project_num + sop.project_num, + oaf.create_time, + oaf.create_by from oa_feedback oaf - left join sys_oa_project sop on sop.project_id = oaf.project_id where oaf.feedback_id = #{feedbackId}