Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/common/WorkOrderEnum.java

@@ -35,7 +35,7 @@ public enum WorkOrderEnum {
     CLOSED(50, "已关闭"),
 
     //已作废
-    CONCELED(60, "已作废");
+    CONCELED(60, "已中止");
 
 
     private Integer orderStatus;