Merge branch 'dev' into 'master'

问卷调查保存新的字段

See merge request !7

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

@@ -181,6 +181,10 @@ public class ResearchController {
             research.setImage(researchVo.getImage());
             research.setEnableTask(researchVo.getEnableTask());
 
+            research.setVoteNum(researchVo.getVoteNum());
+            research.setBizType(researchVo.getBizType());
+            research.setPageMode(researchVo.getPageMode());
+            
             // 审计字段
             research.setUpdateById(context.getAccountId());
             research.setUpdateByName(context.getAccountName());