Merge remote-tracking branch 'origin/edu/Manger' into edu/Manger

src/main/java/com/config/InterceptorConfig.java

@@ -28,11 +28,11 @@ public class InterceptorConfig extends WebMvcConfigurationSupport{
 	@Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		registry.addResourceHandler("/**")
-        .addResourceLocations("classpath:/resources/")//测试
-        .addResourceLocations("classpath:/static/")//测试
-        .addResourceLocations("classpath:/admin/")//测试
+        .addResourceLocations("classpath:/resources/")
+        .addResourceLocations("classpath:/static/")
+        .addResourceLocations("classpath:/admin/")
         .addResourceLocations("classpath:/front/")
         .addResourceLocations("classpath:/public/");
-		super.addResourceHandlers(registry);
+		super.addResourceHandlers(registry);//测试
     }
 }