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

# Conflicts:
#	nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/ImportExcelServiceImpl.java
#	nafmii-admin/src/main/resources/mapper/ImportExcelMapper.xml

nafmii-gateway/src/main/java/org/nafmii/gateway/config/MySwaggerResourceProvider.java

@@ -30,7 +30,7 @@ public class MySwaggerResourceProvider implements SwaggerResourcesProvider {
      */
     private final RouteLocator routeLocator;
     private final String serverName1=  "NAFMII-APP";
-    private final String serverName2=  "GATEWAY";
+    private final String serverName2=  "NAFMII-GATEWAY";
     private final String serverName3=  "NAFMII-ADMIN";
     private final String serverName4=  "NAFMII-QUARTZ";