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

distributed-print-business/src/main/resources/db/3.2.3更新脚本-增量.sql

@@ -56,7 +56,7 @@ INSERT INTO sys_role
 VALUES(9, NULL, NULL, '学校管理员', 1, 'SCHOOL_ADMIN', NULL, NULL, NULL, NULL, 1, 'SYS', '系统内置');
 INSERT INTO sys_role
 (id, school_id, org_id, name, enable, `type`, create_id, create_time, update_id, update_time, default_role, source, interpret)
-VALUES(10, NULL, NULL, '学校老师', 1, 'SCHOOL_TEACHER', NULL, NULL, NULL, NULL, 1, 'SYS', '系统内置');
+VALUES(10, NULL, NULL, '老师', 1, 'SCHOOL_TEACHER', NULL, NULL, NULL, NULL, 1, 'SYS', '系统内置');
 INSERT INTO sys_role
 (id, school_id, org_id, name, enable, `type`, create_id, create_time, update_id, update_time, default_role, source, interpret)
 VALUES(11, NULL, NULL, '学院秘书', 1, 'ASSISTANT', NULL, NULL, NULL, NULL, 1, 'SYS', '系统内置');
@@ -1166,7 +1166,7 @@ INSERT INTO sys_role_privilege
 VALUES(491, 11, 442, 1);
 INSERT INTO sys_role_privilege
 (id, role_id, privilege_id, enable)
-VALUES(492, 11, 672, 1);
+VALUES(494, 10, 671, 1);
 
 UPDATE sys_privilege
 SET name='课程管理'

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/RoleTypeEnum.java

@@ -19,7 +19,7 @@ public enum RoleTypeEnum {
     MARKER_LEADER("科组长"),
     SUBJECT_TEACHER("学科老师"),
     ASSIGN_TEACHER("命题老师"),
-    SCHOOL_TEACHER("学校老师"),
+    SCHOOL_TEACHER("老师"),
     ASSISTANT("学院秘书");
 
     RoleTypeEnum(String desc) {