Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/PerformancesExpressInfoServiceImpl.java

@@ -35,11 +35,9 @@ public class PerformancesExpressInfoServiceImpl {
     public KylinOrderExpressVo orderRouteDetail(String orderTicketsId) {
         LinkedList<KylinOrderExpressRouteVo> routeList = dataUtils.getOrderExpressRoute(orderTicketsId);
         KylinOrderExpressVo expressInfo = dataUtils.getOrderExpressInfos(orderTicketsId);
-        if (null == routeList) {
-            routeList = new LinkedList<>();
+        if (null != expressInfo) {
+            expressInfo.setRouteList(routeList);
         }
-        log.info("1111");
-        expressInfo.setRouteList(routeList);
         return expressInfo;
     }
 }
\ No newline at end of file