Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

simonlll месяцев назад: 4
Родитель
Сommit
224cae7387

+ 2 - 1
airport-common/src/main/java/com/sundot/airport/common/enums/CheckLevelEnum.java

@@ -11,7 +11,8 @@ import lombok.Getter;
11
 public enum CheckLevelEnum {
11
 public enum CheckLevelEnum {
12
 
12
 
13
     STATION_LEVEL("STATION_LEVEL", "站级"),
13
     STATION_LEVEL("STATION_LEVEL", "站级"),
14
-    DEPARTMENT_LEVEL("DEPARTMENT_LEVEL", "科级"),
14
+    BRIGADE_LEVEL("BRIGADE_LEVEL", "大队级"),
15
+    DEPARTMENT_LEVEL("DEPARTMENT_LEVEL", "主管级"),
15
     TEAM_LEVEL("TEAM_LEVEL", "班组级"),
16
     TEAM_LEVEL("TEAM_LEVEL", "班组级"),
16
     PERSONNEL_LEVEL("PERSONNEL_LEVEL", "人员级");
17
     PERSONNEL_LEVEL("PERSONNEL_LEVEL", "人员级");
17
 
18
 

+ 2 - 0
airport-common/src/main/java/com/sundot/airport/common/enums/DeptType.java

@@ -13,6 +13,8 @@ import lombok.Getter;
13
 @AllArgsConstructor
13
 @AllArgsConstructor
14
 public enum DeptType {
14
 public enum DeptType {
15
     STATION("STATION", "机构站"),
15
     STATION("STATION", "机构站"),
16
+    BRIGADE("BRIGADE", "大队"),
17
+    MANAGER("MANAGER", "主管"),
16
     DEPARTMENT("DEPARTMENT", "科室"),
18
     DEPARTMENT("DEPARTMENT", "科室"),
17
     TEAMS("TEAMS", "班组"),
19
     TEAMS("TEAMS", "班组"),
18
     ;
20
     ;

+ 3 - 1
airport-common/src/main/java/com/sundot/airport/common/enums/RoleTypeEnum.java

@@ -14,7 +14,9 @@ public enum RoleTypeEnum {
14
     common("common", "普通角色"),
14
     common("common", "普通角色"),
15
     test("test", "站长"),
15
     test("test", "站长"),
16
     zhijianke("zhijianke", "质检科"),
16
     zhijianke("zhijianke", "质检科"),
17
-    kezhang("kezhang", "科长"),
17
+    jingli("jingli", "经理"),
18
+    xingzheng("xingzheng", "大队行政"),
19
+    kezhang("kezhang", "主管"),
18
     banzuzhang("banzuzhang", "班组长"),
20
     banzuzhang("banzuzhang", "班组长"),
19
     SecurityCheck("SecurityCheck", "安检员");
21
     SecurityCheck("SecurityCheck", "安检员");
20
 
22