Merge remote-tracking branch 'origin/develop' into develop

project-interface/src/main/java/com/dituhui/pea/enums/StatusCodeEnum.java

@@ -132,7 +132,7 @@ public enum StatusCodeEnum {
 
 
     FENDAN_ENGINEER_UNMATCHED("023", "分单接口没有查到配置工程师", false),
     FENDAN_ENGINEER_UNMATCHED("023", "分单接口没有查到配置工程师", false),
 
 
-    FENDAN_IS_TRANSCEND("024", "分单超派", false),
+    FENDAN_IS_TRANSCEND("024", "分单容量超限", false),
 
 
     RESOURCE_USER_EXISTS_ROLE("025", "角色已绑定用户，请解绑用户后再删除角色！", false),
     RESOURCE_USER_EXISTS_ROLE("025", "角色已绑定用户，请解绑用户后再删除角色！", false),
 
 
@@ -146,7 +146,7 @@ public enum StatusCodeEnum {
 
 
     ORDER_FINISHED("030", "订单已结束,请勿操作", false),
     ORDER_FINISHED("030", "订单已结束,请勿操作", false),
 
 
-    FENDAN_IS_TRANSCEND_AND_SPECIAL("031", "分单超派和特殊时间", false),
+    FENDAN_IS_TRANSCEND_AND_SPECIAL("031", "分单容量超限和特殊时间", false),
 
 
     ENGINEER_IS_LEAVE_TIME("032", "工单（%s）指派失败！%s的工作日历在该时间段已有日程安排", false),
     ENGINEER_IS_LEAVE_TIME("032", "工单（%s）指派失败！%s的工作日历在该时间段已有日程安排", false),
     ;
     ;

project-order/src/main/java/com/dituhui/pea/order/enums/OrderPeaTagsEnum.java

@@ -5,7 +5,7 @@ public enum OrderPeaTagsEnum {
     special("特殊时段"),
     special("特殊时段"),
     cutoff("当日加单"),
     cutoff("当日加单"),
     multipleOrders("一家多台"),
     multipleOrders("一家多台"),
-    transcend("超派"),
+    transcend("容量超限"),
     urgent("紧急");
     urgent("紧急");
 
 
     private String tag;
     private String tag;