附加Git master 和 分支的合并
# 切换到master分支,执行下面命令,将dev合并到master
git merge -m '合并master到dev' dev
# 切换到dev分支,执行下面命令,将master合并到dev
git merge -m '合并master到dev' master
配置Swagger
@Configuration
@EnableSwagger2
public class Swagger2Config {
@Bean
public Docket apiConfig() {
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.build();
}
public ApiInfo apiInfo() {
return new ApiInfoBuilder().description("接口文档").version("v1.0").build();
}
}