Merge branch 'dev_dispatch_op0712' into 'develop'

修改

See merge request !218

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

@@ -119,7 +119,7 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 			record.setSkill(o.getSkill());
 			record.setName(o.getName());
 			record.setPhone(o.getPhone());
-			record.setAddress(o.getAddress());
+			record.setAddress(String.format("%s%s%s", o.getCity(), o.getCounty(),o.getAddress()));
 			record.setX(o.getX());
 			record.setY(o.getY());
 			record.setSource(o.getSource());