Merge branch 'dev_dispatch_op0712' into 'develop'

优化展示

See merge request !219

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

@@ -73,7 +73,7 @@ public class DispatchServiceImpl implements DispatchService {
 			item.setRemark(o.getApplyNote());
 			item.setRemark(o.getApplyNote());
 			item.setCustomerName(o.getName());
 			item.setCustomerName(o.getName());
 
 
-			String description = String.format("%s:%s%s-%s\n%s:%s%s%s", o.getOrderId(), o.getSkill(),
+			String description = String.format("%s:%s%s-%s\n%s:%s-%s-%s", o.getOrderId(), o.getSkill(),
 					o.getType(), o.getBrand(), o.getName(), o.getCity(), o.getCounty(), o.getAddress());
 					o.getType(), o.getBrand(), o.getName(), o.getCity(), o.getCounty(), o.getAddress());
 			item.setDescription(description);
 			item.setDescription(description);
 
 

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.setSkill(o.getSkill());
 			record.setName(o.getName());
 			record.setName(o.getName());
 			record.setPhone(o.getPhone());
 			record.setPhone(o.getPhone());
-			record.setAddress(String.format("%s%s%s", o.getCity(), o.getCounty(),o.getAddress()));
+			record.setAddress(String.format("%s-%s-%s", o.getCity(), o.getCounty(),o.getAddress()));
 			record.setX(o.getX());
 			record.setX(o.getX());
 			record.setY(o.getY());
 			record.setY(o.getY());
 			record.setSource(o.getSource());
 			record.setSource(o.getSource());