Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -1184,4 +1184,12 @@ WHERE id=42;
 
 UPDATE sys_privilege
 SET name='列表', url='List', `type`='LIST', parent_id=21, `sequence`=1, property='AUTH', related='1031,3044,1030', enable=1, default_auth=0, front_display=1
-WHERE id=127;
+WHERE id=127;
+
+UPDATE sys_privilege
+SET name='启用/禁用', url='Enable', `type`='LINK', parent_id=15, `sequence`=2, property='AUTH', related='284', enable=1, default_auth=0, front_display=1
+WHERE id=121;
+
+INSERT INTO sys_role
+(id, org_id, name, enable, `type`, create_id, create_time, update_id, update_time, default_role, interpret)
+VALUES(11, NULL, '乙方总负责人', 1, 'THIRD_PMO', NULL, NULL, NULL, NULL, 1, '系统角色');

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

@@ -30,6 +30,8 @@ public enum RoleTypeEnum {
 
     ACCOUNT_MANAGER("客户经理", "系统角色"),
 
+    THIRD_PMO("乙方总负责人", "系统角色"),
+
     DEFINED("自定义", "自定义角色");
 
     RoleTypeEnum(String desc, String title) {