Merge branch 'dev_dispatch_op0712' into 'develop'

修改

See merge request !217

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

@@ -73,8 +73,8 @@ public class DispatchServiceImpl implements DispatchService {
 			item.setRemark(o.getApplyNote());
 			item.setCustomerName(o.getName());
 
-			String description = String.format("%s:%s%s-%s\n%s:%s", o.getOrderId(), o.getSkill(),
-					o.getType(), o.getBrand(), o.getName(), o.getAddress());
+			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());
 			item.setDescription(description);
 
 			String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());