Merge branch 'pudong' into pudong_jdk8

# Conflicts: # src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java

Merge branch 'pudong' into pudong_jdk8
# Conflicts: # src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
王通
1 parent 6e116423
Showing 1 changed file with 0 additions and 1 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
@@ -35,7 +35,6 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
  
-import javax.ws.rs.HEAD;
 import java.io.*;
 import java.net.InetAddress;
 import java.sql.Connection;