From c4495f1b1561c2360618c2a50982da59bac20274 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 22 May 2023 17:19:50 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E7=AB=A0=E8=8A=82i?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java   | 3 +++
 web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java b/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java
index 501be557..e45560bb 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/vo/TeacherOpenCourseQuestionTestSimpleInfoVO.java
@@ -38,6 +38,9 @@ public class TeacherOpenCourseQuestionTestSimpleInfoVO extends QuestionLogSummar
 
     private Date teacherOpenCourseQuestionEndTime;
 
+
+    private Long teacherOpenCourseMergeCourseInfoId;
+
     // 是否已交卷
 
     private Boolean isFinished;
diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
index a957a478..d60606fd 100644
--- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
+++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
@@ -715,6 +715,7 @@ getQuestionTestSimpleInfo
     t.teacher_open_course_question_setting_type,
     t.teacher_open_course_question_start_time,
     t.teacher_open_course_question_end_time,
+    t.teacher_open_course_merge_course_info_id,
     ta.*,
     ( select count(distinct(tb.resources_question_snapshot_id)) from resources_question_snapshot tb 
       where tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id