Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -57,6 +57,7 @@ CREATE TABLE IF NOT EXISTS `basic_card_rule` (
   `undertaking_body` varchar(300) DEFAULT NULL COMMENT '考生承诺书内容',
   `required_fields` text NOT NULL COMMENT '必选字段',
   `extend_fields` text NOT NULL COMMENT '扩展字段',
+  `fill_fields` text DEFAULT NULL COMMENT '变量信息填充字段',
   `title_rule` varchar(200) NOT NULL COMMENT '题卡标题规则',
   `attention` text NOT NULL COMMENT '注意事项',
   `objective_attention` text COMMENT '客观题注意事项',

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

@@ -772,7 +772,7 @@ ALTER TABLE t_r_basic_info MODIFY COLUMN teaching_object varchar(1000) NULL COMM
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1139', '轨迹图查询题卡内容', '/api/admin/mark/track/getCard', 'URL', '946', '12', 'AUTH', '1', '1', '1');
 UPDATE `sys_privilege` SET `related` = '953,954,955,956,957,958,959,960,969,1139' WHERE (`id` = '950');
 
-ALTER TABLE `basic_card_rule` ADD COLUMN `fill_fields` VARCHAR(500) NULL COMMENT '变量信息填充字段' AFTER `extend_fields`;
+ALTER TABLE `basic_card_rule` ADD COLUMN `fill_fields` TEXT NULL COMMENT '变量信息填充字段' AFTER `extend_fields`;
 
 delete from basic_operation_log where customized_operation_type = 'SEARCH';
 update basic_operation_log set customized_operation_type = 'SYNC',operation_type='EDIT' where customized_operation_type = 'PUSH';