Merge branch 'dev_bugfix_orderrequests' into 'develop'

Dev bugfix orderrequests

See merge request !129

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

@@ -14,6 +14,7 @@ public class OrderServiceList {
 	private String address;
 	private String x;
 	private String y;
+	private Integer priority;
 	private String expectTimeBegin;
 	private String expectTimeEnd;
 	private String source;

project-order/src/main/java/com/dituhui/pea/order/entity/OrderRequest.java

@@ -25,7 +25,7 @@ public class OrderRequest {
 	private Timestamp expectTimeEnd;
 	private String expectTimeDesc;
 	private String source;
-	private String priority;
+	private Integer priority;
 	private String areaId;
 	private String orderTags;
 	private String tags;

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -78,6 +78,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			record.setY(o.getY());
 			record.setSource(o.getSource());
 			record.setDescription(o.getDescription());
+			record.setPriority(o.getPriority());
 			record.setOrgBranchName(o.getOrgBranchName());
 			record.setEngineerNum(this.getEngNum(names)); //工程师数量
 			record.setEngineerNames(this.getEngNames(names)); //工程师姓名列表