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

distributed-print-business/src/main/resources/db/install/teachcloud_db.sql

@@ -3341,7 +3341,7 @@ INSERT INTO `sys_role_privilege` VALUES (501, 11, 855, 1);
 INSERT INTO `sys_role_privilege` VALUES (502, 11, 857, 1);
 INSERT INTO `sys_role_privilege` VALUES (503, 11, 858, 1);
 INSERT INTO `sys_role_privilege` VALUES (504, 11, 859, 1);
-INSERT INTO `sys_role_privilege` VALUES (505, 10, 832, 1);
+INSERT INTO `sys_role_privilege` VALUES (505, 11, 866, 1);
 INSERT INTO `sys_role_privilege` VALUES (506, 10, 576, 1);
 INSERT INTO `sys_role_privilege` VALUES (507, 10, 833, 1);
 INSERT INTO `sys_role_privilege` VALUES (508, 10, 834, 1);
@@ -3370,4 +3370,5 @@ INSERT INTO `sys_role_privilege` VALUES (530, 10, 866, 1);
 INSERT INTO `sys_role_privilege` VALUES (531, 10, 830, 1);
 INSERT INTO `sys_role_privilege` VALUES (532, 10, 831, 1);
 INSERT INTO `sys_role_privilege` VALUES (533, 10, 575, 1);
-INSERT INTO `sys_role_privilege` VALUES (534, 9, 867, 1);
+INSERT INTO `sys_role_privilege` VALUES (534, 9, 867, 1);
+INSERT INTO `sys_role_privilege` VALUES (535, 10, 832, 1);

distributed-print-business/src/main/resources/db/upgrade/3.2.5/1、升级3.2.5数据库修改脚本.sql

@@ -26,4 +26,4 @@ ALTER TABLE `exam_print_plan`
     CHANGE COLUMN `backup_count` `backup_count` DOUBLE NOT NULL COMMENT '试卷、题卡备份数量（0-1为按比例，大于等于1为按数量）' ;
 
 ALTER TABLE `basic_print_config`
-    CHANGE COLUMN `backup_count` `backup_count` DOUBLE NULL DEFAULT NULL COMMENT '试卷、题卡备份数量（0-1为按比例，大于等于1为按数量）' ;
+    CHANGE COLUMN `backup_count` `backup_count` DOUBLE NULL DEFAULT NULL COMMENT '试卷、题卡备份数量（0-1为按比例，大于等于1为按数量）' ;

distributed-print-business/src/main/resources/db/upgrade/3.2.5/2、升级3.2.5数据修改脚本.sql

@@ -1,6 +1,5 @@
 USE teachcloud_db;
 
-INSERT INTO `sys_role_privilege` VALUES (505, 10, 832, 1);
 INSERT INTO `sys_role_privilege` VALUES (506, 10, 576, 1);
 INSERT INTO `sys_role_privilege` VALUES (507, 10, 833, 1);
 INSERT INTO `sys_role_privilege` VALUES (508, 10, 834, 1);
@@ -30,6 +29,7 @@ INSERT INTO `sys_role_privilege` VALUES (531, 10, 830, 1);
 INSERT INTO `sys_role_privilege` VALUES (532, 10, 831, 1);
 INSERT INTO `sys_role_privilege` VALUES (533, 10, 575, 1);
 INSERT INTO `sys_role_privilege` VALUES (534, 9, 867, 1);
+INSERT INTO `sys_role_privilege` VALUES (535, 10, 832, 1);
 
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('867', '下载', 'Download', 'LINK', '624', '9', 'AUTH', '868', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('868', '下载', '/api/admin/exam/card/download_card', 'URL', '624', '6', 'AUTH', '1', '1', '1');