Merge branch 'dev' of yeshijie/jw2.0 into dev

server/svr-zipkin/src/main/java/com/yihu/ZipkinTrackServer.java

@@ -2,7 +2,8 @@ package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import zipkin.server.EnableZipkinServer;
import zipkin.server.internal.EnableZipkinServer;
/**
 * Created by chenweida on 2017/5/18.