Merge remote-tracking branch 'origin/master'

huliguo

4 天以前 1cb09e4cde9fb97b8369478a9fc16418ac4e29a4

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

@@ -2,7 +2,11 @@

import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.List;

import com.linghu.model.entity.Keyword;
import com.linghu.model.entity.Question;

@EqualsAndHashCode(callSuper = true)
@Data
@@ -11,4 +15,6 @@
     * 提问词列表，用换行符分隔
     */
    private String questions;
}

    private List<Question> questionList;
}