Merge branch 'dev' into 'master'

去掉url

See merge request !20

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/pvt_service_traffic/parm/ViolationFeign.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author: xieshixiang
  * @author: xieshixiang
  * @time：2020/6/19 15:26
  * @time：2020/6/19 15:26
  **/
  **/
-@FeignClient(url = "http://10.197.236.198:8116", name = "edl-pvt-service-traffic", path = "violation", contextId =
+@FeignClient(name = "edl-pvt-service-traffic", path = "violation", contextId =
         "dcp-pvt-service-traffic")
         "dcp-pvt-service-traffic")
 public interface ViolationFeign {
 public interface ViolationFeign {
     /**
     /**