Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/java/com/zehong/web/controller/system/TBankSubjectController.java

@@ -156,7 +156,6 @@ public class TBankSubjectController extends BaseController
                     excelEntity.setBankId(bankId);
                     /**题目*/
                     excelEntity.setTopicTitle(row.getCell(0).toString());
-                    System.out.println(row.getCell(10).toString());
                     /**题目类型*/
                     excelEntity.setTopicType(Integer.valueOf(row.getCell(10).toString()));
                     /**题目*/

danger-manage-system/src/main/resources/mapper/system/TTrainCourseTopicMapper.xml

@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="batchInsertTTrainCourseTopic" parameterType="java.util.List">
         insert into t_train_course_topic(course_id,topic_title,topic_option,answer,create_time,topic_type) values
         <foreach collection="list" item="topic" index="index" separator="," >
-         (#{topic.courseId},#{topic.topicTitle},#{topic.topicOption},#{topic.answer},#{topic.createTime},#{topicType})
+         (#{topic.courseId},#{topic.topicTitle},#{topic.topicOption},#{topic.answer},#{topic.createTime},#{topic.topicType})
         </foreach>
     </insert>
 </mapper>