Merge branch 'dev' into 'master'

投票保存关键字

See merge request !9

cloud-web-manage/src/main/java/com/yizhi/application/research/controller/manage/ResearchQuestionController.java

@@ -344,6 +344,7 @@ public class ResearchQuestionController {
         question.setContentAppendixUrl(questionVo.getContentAppendixUrl());
         question.setNeedAnswer(questionVo.getNeedAnswer());
         question.setDeleted(0);
+        question.setKeywords(questionVo.getKeywords());
 
         return question;
     }