Merge branch 'dev_1.3.6' into dev_1.3.7

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -93,6 +93,8 @@ CREATE TABLE `b_user`
     `updated_time`              datetime    DEFAULT NULL COMMENT '修改时间',
     `access_token`              varchar(64) DEFAULT NULL COMMENT '访问令牌',
     `access_token_refresh_time` datetime    DEFAULT NULL COMMENT '访问令牌刷新时间',
+    `scan_token`              varchar(64) DEFAULT NULL COMMENT '扫描访问令牌',
+    `scan_token_invalid_time` datetime    DEFAULT NULL COMMENT '扫描访问令牌刷新时间',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`login_name`),
     UNIQUE KEY `index2` (`school_id`, `related_account`),
@@ -244,6 +246,7 @@ CREATE TABLE `eb_exam_question`
     `total_score`      double      NOT NULL COMMENT '满分',
     `interval_score`   double      NOT NULL COMMENT '评卷间隔分',
     `objective_policy` varchar(16)          DEFAULT NULL COMMENT '客观题判分策略',
+	`question_type`		varchar(32)         DEFAULT NULL COMMENT '题型',
     PRIMARY KEY (`id`),
     KEY `index1` (`exam_id`, `subject_code`, `is_objective`, `main_number`, `sub_number`, `paper_type`)
 ) ENGINE = InnoDB