Merge remote-tracking branch 'origin/master'

sgj

2 天以前 18127822f3cdb4778fb62ba0304bb8372dada516

 fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java

@@ -1,7 +1,6 @@
package com.fzzy.d7;

import com.bstek.dorado.web.servlet.DoradoServlet;

import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;