Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

@@ -20,7 +20,7 @@ public class Swagger2 {
         return new Docket(DocumentationType.SWAGGER_2)
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .apiInfo(apiInfo())
                 .select()
                 .select()
-                //为当前包路径
+                //为，当前包路径
                 .apis(RequestHandlerSelectors.basePackage("com.tianbo.warehouse.controller"))
                 .apis(RequestHandlerSelectors.basePackage("com.tianbo.warehouse.controller"))
                 .paths(PathSelectors.any())
                 .paths(PathSelectors.any())
                 .build();
                 .build();