Merge remote-tracking branch 'origin/dev' into dev

ea6450ab · liuyongshuai · 7ac6bd7b · a4316b0d · ea6450ab
Commit ea6450ab authored Nov 20, 2018 by liuyongshuai
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

src/main/java/com/cc/ServletInitializer.java
+2 -1

No files found.
--- a/src/main/java/com/cc/ServletInitializer.java
+++ b/src/main/java/com/cc/ServletInitializer.java
 package com.cc;

 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+

 public class ServletInitializer extends SpringBootServletInitializer {