From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
index fc9ed34..efd67a6 100644
--- a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
+++ b/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswerInfo.java
@@ -1,6 +1,9 @@
 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;
@@ -10,8 +13,8 @@
 
     public ExamPaper examPaper;
 
-    public ExamPaperAnswer examPaperAnswer;
+    public ExamPaperScore examPaperScore;
 
-    public List<ExamPaperQuestionCustomerAnswer> examPaperQuestionCustomerAnswers;
+    public List<ExamPaperScoreDetail> examPaperScoreDetails;
 
 }

--
Gitblit v1.8.0