From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 05 七月 2024 09:57:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java index d23900f..efd67a6 100644 --- a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java +++ b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java @@ -1,34 +1,20 @@ package com.ycl.jxkg.domain; +import com.ycl.jxkg.domain.entity.ExamPaper; +import com.ycl.jxkg.domain.entity.ExamPaperScore; +import com.ycl.jxkg.domain.entity.ExamPaperScoreDetail; +import lombok.Data; + import java.util.List; +@Data public class ExamPaperAnswerInfo { + public ExamPaper examPaper; - public ExamPaperAnswer examPaperAnswer; - public List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers; - public ExamPaper getExamPaper() { - return examPaper; - } + public ExamPaperScore examPaperScore; - public void setExamPaper(ExamPaper examPaper) { - this.examPaper = examPaper; - } + public List<ExamPaperScoreDetail> examPaperScoreDetails; - public ExamPaperAnswer getExamPaperAnswer() { - return examPaperAnswer; - } - - public void setExamPaperAnswer(ExamPaperAnswer examPaperAnswer) { - this.examPaperAnswer = examPaperAnswer; - } - - public List<ExamPaperQuestionCustomerAnswer> getExamPaperQuestionCustomerAnswers() { - return examPaperQuestionCustomerAnswers; - } - - public void setExamPaperQuestionCustomerAnswers(List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers) { - this.examPaperQuestionCustomerAnswers = examPaperQuestionCustomerAnswers; - } } -- Gitblit v1.8.0