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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
index 9e663b1..efd67a6 100644
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
+++ b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
@@ -2,8 +2,8 @@
import com.ycl.jxkg.domain.entity.ExamPaper;
-import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
-import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
+import com.ycl.jxkg.domain.entity.ExamPaperScore;
+import com.ycl.jxkg.domain.entity.ExamPaperScoreDetail;
import lombok.Data;
import java.util.List;
@@ -13,8 +13,8 @@
public ExamPaper examPaper;
- public ExamPaperAnswer examPaperAnswer;
+ public ExamPaperScore examPaperScore;
- public List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers;
+ public List<ExamPaperScoreDetail> examPaperScoreDetails;
}
--
Gitblit v1.8.0