Merge remote-tracking branch 'origin/master'

huliguo

昨天 23ac3e4f8fb16db0759ba5c91c4d06d622c67009

 src/main/java/com/linghu/service/KeywordService.java

@@ -16,7 +16,7 @@
 */
public interface KeywordService extends IService<Keyword> {

    ResponseResult<KeywordStaticsListVO> statics(Integer keywordId, Integer questionId);
    ResponseResult<KeywordStaticsListVO>statics(Integer keywordId, Integer questionId);

    ResponseResult<List<PlatformProportionVO>> getResultByTypeId(Integer keywordId, Integer questionId, Integer typeId);