diff --git a/web/pom.xml b/web/pom.xml
index 6d98eb84..8274be54 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -246,28 +246,49 @@
 			<artifactId>quartz</artifactId>
 		</dependency>
     </dependencies>
+<!--	<build>-->
+<!--		<plugins>-->
+<!--			<plugin>-->
+<!--				<groupId>org.springframework.boot</groupId>-->
+<!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--				<version>${spring.boot.version}</version> &lt;!&ndash; 如果 spring.boot.version 版本修改，则这里也要跟着修改 &ndash;&gt;-->
+<!--			</plugin>-->
+<!--			<plugin>-->
+<!--				<groupId>org.apache.maven.plugins</groupId>-->
+<!--				<artifactId>maven-compiler-plugin</artifactId>-->
+<!--				<configuration>-->
+<!--					<source>1.8</source>-->
+<!--					<target>1.8</target>-->
+<!--					<encoding>UTF-8</encoding>-->
+<!--					<optimize>false</optimize>-->
+<!--					<debug>false</debug>-->
+<!--					<showDeprecation>false</showDeprecation>-->
+<!--					<showWarnings>true</showWarnings>-->
+<!--					<compilerArguments>-->
+<!--						<bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>-->
+<!--					</compilerArguments>-->
+<!--				</configuration>-->
+<!--			</plugin>-->
+<!--		</plugins>-->
+<!--	</build>-->
+
 	<build>
 		<plugins>
+			<!-- 打包 -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<version>${spring.boot.version}</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<encoding>UTF-8</encoding>
-					<optimize>false</optimize>
-					<debug>false</debug>
-					<showDeprecation>false</showDeprecation>
-					<showWarnings>true</showWarnings>
-					<compilerArguments>
-						<bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath>
-					</compilerArguments>
+					<fork>true</fork>
 				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java
index 22a03cbc..b6bc863c 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherMergeApplicationDao.java
@@ -3,12 +3,12 @@ package com.ibeetl.jlw.dao;
 import cn.hutool.core.util.ObjectUtil;
 import com.ibeetl.jlw.entity.TeacherMergeApplication;
 import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery;
-import com.sun.istack.internal.NotNull;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java
index 9873d219..3e70eca3 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java
@@ -4,12 +4,12 @@ import com.ibeetl.jlw.entity.Student;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeStudent;
 import com.ibeetl.jlw.entity.dto.RandomStudentListDTO;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery;
-import com.sun.istack.internal.NotNull;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java
index 530dd9a2..dddbbe41 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeTeacherDao.java
@@ -3,12 +3,12 @@ package com.ibeetl.jlw.dao;
 import cn.hutool.core.util.ObjectUtil;
 import com.ibeetl.jlw.entity.TeacherOpenCourseMergeTeacher;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeTeacherQuery;
-import com.sun.istack.internal.NotNull;
 import org.beetl.sql.core.engine.PageQuery;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
index b0ad2dae..8ff9ad23 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -25,7 +25,6 @@ import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum;
 import com.ibeetl.jlw.web.query.ResourcesQuestionSnapshotQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionSettingQuery;
-import com.sun.istack.internal.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
@@ -416,7 +415,6 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
 
         TeacherOpenCourseQuestionSettingQuery settingQuery = new TeacherOpenCourseQuestionSettingQuery();
         settingQuery.setTeacherOpenCourseQuestionSettingId(questionSnapshots.get(0).getTeacherOpenCourseQuestionSettingId());
-        @Nullable
         final TeacherOpenCourseQuestionSetting hwSetting = teacherOpenCourseQuestionSettingSettingService.getInfo(settingQuery);
 
         // 答卷后显示答案解析