Commit 8fd41b9069acb7dbcd5b0aaab7a11c93bed4df9a
1 parent
6e116423
Merge branch 'pudong' into pudong_jdk8
# Conflicts: # src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
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; | @@ -35,7 +35,6 @@ import org.springframework.data.domain.Sort.Direction; | ||
| 35 | import org.springframework.security.core.context.SecurityContextHolder; | 35 | import org.springframework.security.core.context.SecurityContextHolder; |
| 36 | import org.springframework.stereotype.Service; | 36 | import org.springframework.stereotype.Service; |
| 37 | 37 | ||
| 38 | -import javax.ws.rs.HEAD; | ||
| 39 | import java.io.*; | 38 | import java.io.*; |
| 40 | import java.net.InetAddress; | 39 | import java.net.InetAddress; |
| 41 | import java.sql.Connection; | 40 | import java.sql.Connection; |