3.3.1 merge dev_3.3.0

distributed-print/install/config.ini

@@ -18,7 +18,7 @@ after=
 
 [upgrade]
 //升级支持的最小版本号，可以为空
-minmum_version=3.2.7
+//minmum_version=3.2.7
 
 //与module配置对应，一个模块一组配置
 [print]

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -1,3 +1,5 @@
+USE teachcloud_db;
+
 -- ----------------------------
 -- Table structure for mark_arbitrate_history
 -- ----------------------------
@@ -879,4 +881,4 @@ ALTER TABLE `basic_template`
     ADD COLUMN `add_blank_page` TINYINT(1) NULL DEFAULT 1 COMMENT '是否增加空白页' AFTER `update_time`,
 ADD COLUMN `line_height_times` DOUBLE NULL DEFAULT 1 COMMENT '行间距在初始值扩大倍数（默认1）' AFTER `add_blank_page`;
 
-ALTER TABLE `basic_school` ADD COLUMN `default_school` TINYINT(1) NULL DEFAULT 0 AFTER `init_password`;
+ALTER TABLE `basic_school` ADD COLUMN `default_school` TINYINT(1) NULL DEFAULT 0 AFTER `init_password`;