Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java

@@ -4,31 +4,38 @@ import lombok.Data;
 
 @Data
 public class OrderServiceList {
-	private String orderId;
-	private String type;
-	private String brand;
-	private String skill;
-	private String faultDescribe;
-	private String name;
-	private String phone;
-	private String address;
-	private String x;
-	private String y;
-	private Integer priority;
-	private Integer takeTime;
-	private String expectTimeBegin;
-	private String expectTimeEnd;
-	private String expectTimeDesc;
-	private String source;
-	private String description;
-	private String orgBranchName;
-	private Integer engineerNum;
-	private String engineerNames;
-	private String dispatcher;
-	private String appointmentTime;
-	private String appointmentType;
-	private String appointmentStatus;
-	private String orderStatus;
-	private String serviceStatus;
-	private String createTime;
+    private String orderId;
+    private String type;
+    private String brand;
+    private String skill;
+    private String faultDescribe;
+    private String name;
+    private String phone;
+    private String address;
+    private String x;
+    private String y;
+    private Integer priority;
+    private Integer takeTime;
+    private String expectTimeBegin;
+    private String expectTimeEnd;
+    private String expectTimeDesc;
+    private String source;
+    private String description;
+    private String orgBranchName;
+    private Integer engineerNum;
+    private String engineerNames;
+    private String dispatcher;
+    private String appointmentTime;
+    private String appointmentType;
+    private String appointmentStatus;
+    private String orderStatus;
+    private String serviceStatus;
+    private String createTime;
+
+    /**
+     * bean优先级,例如:紧急、正常
+     */
+    private String beanPriority;
+
+
 }