3.3.0 更新脚本

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

@@ -864,11 +864,6 @@ UPDATE `sys_privilege` SET `related` = '490,543' WHERE (`id` = '488');
 UPDATE `sys_privilege` SET `related` = '494,544' WHERE (`id` = '489');
 UPDATE `sys_privilege` SET `parent_id` = '489', `sequence` = '2' WHERE (`id` = '544');
 
-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_card_rule`
     ADD COLUMN `undertaking_enable` TINYINT(1) NULL COMMENT '启用考生承诺书' AFTER `discipline`,
 ADD COLUMN `undertaking_body` VARCHAR(300) NULL COMMENT '考生承诺书内容' AFTER `undertaking_enable`;
@@ -878,4 +873,10 @@ ALTER TABLE `basic_template`
 
 ALTER TABLE `basic_operation_log`
     CHANGE COLUMN `customized_operation_type` `customized_operation_type` VARCHAR(32) CHARACTER SET 'utf8' NULL COMMENT '自定义记录日志操作类型（LOGIN(\"用户登录\"),LOGOUT(\"用户登出\"),ADD(\"新增\"),DELETE(\"删除\"),UPDATE(\"修改\"),IMPORT(\"导入\"),EXPORT(\"导出\"),UN_KNOW(\"未知\")）' ;
-update basic_operation_log set customized_operation_type = null where customized_operation_type = '';
+update basic_operation_log set customized_operation_type = null where customized_operation_type = '';
+
+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`;