Merge branch 'dev' into 'master'

新建问卷

See merge request !5

cloud-research-api/src/main/java/com/yizhi/research/application/vo/manage/ResearchVo.java

@@ -67,4 +67,13 @@ public class ResearchVo {
     @ApiModelProperty(value = "是否启用在日历任务中显示")
     private Integer enableTask;
     
+    @ApiModelProperty(value = "业务类型：1调研；2投票")
+    private Integer bizType;
+    
+    @ApiModelProperty(value = "呈现样式：1逐题呈现；2整页呈现；3整页投票单选")
+    private Integer pageMode;
+    
+    @ApiModelProperty(value = "投票选择次数：0无限制")
+    private Integer voteNum;
+
 }