Merge branch 'dev' into 'master'

新建问卷

See merge request !6

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

@@ -103,6 +103,9 @@ public class ResearchController {
             research.setOrgId(context.getOrgId() == null ? new Long(0) : context.getOrgId());
             research.setOrgId(context.getOrgId() == null ? new Long(0) : context.getOrgId());
             research.setKeywords(researchVo.getKeywords());
             research.setKeywords(researchVo.getKeywords());
             research.setEnableTask(researchVo.getEnableTask());
             research.setEnableTask(researchVo.getEnableTask());
+            research.setVoteNum(researchVo.getVoteNum());
+            research.setBizType(researchVo.getBizType());
+            research.setPageMode(researchVo.getPageMode());
             // 审计字段
             // 审计字段
             research.setCreateById(context.getAccountId());
             research.setCreateById(context.getAccountId());
             research.setCreateByName(context.getAccountName());
             research.setCreateByName(context.getAccountName());