Merge remote-tracking branch 'origin/master'

conf/script/1000/orderApi/BE_Order_CreateOrder_DYLK.groovy

@@ -146,7 +146,8 @@ class BE_Order_CreateOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
         orderDeliveryInfo.setDeliverProvince(invokeOrder["receiver_info"]["province"] as String)
         orderDeliveryInfo.setDeliverCity(invokeOrder["receiver_info"]["city"] as String)
         orderDeliveryInfo.setDeliverDistract(invokeOrder["receiver_info"]["district"] as String)
-        orderDeliveryInfo.setDeliverAddress(invokeOrder["receiver_info"]["location_address"] as String)
+//        orderDeliveryInfo.setDeliverAddress(invokeOrder["receiver_info"]["location_address"] as String)
+        orderDeliveryInfo.setDeliverAddress(invokeOrder["receiver_info"]["location_name"] as String + " " + invokeOrder["receiver_info"]["door_plate_num"] as String )
         orderDeliveryInfo.setGeoPoiLocation(new GeoPoiLocation(invokeOrder["receiver_info"]["lng"] as double, invokeOrder["receiver_info"]["lat"] as double))
         orderDeliveryInfo.setGeoLocationSerial(jsonConvert.convertTo(orderDeliveryInfo.geoPoiLocation))
         orderDeliveryInfo.setReceiveMan(invokeOrder["receiver_info"]["receiver_name"] as String)