Merge remote-tracking branch 'origin/master'

huliguo

昨天 23ac3e4f8fb16db0759ba5c91c4d06d622c67009

 src/main/java/com/linghu/model/dto/ExportGetResultDTO.java

@@ -9,6 +9,6 @@
    private Integer keywordId;
    private  Integer questionId;
    private Integer typeId;
    @ApiModelProperty("轮数 0：当前 1：前一轮")
    @ApiModelProperty("轮数 0：当前 1：首次")
    private Integer isNow;
}