Merge branch 'release' into 'feature/ljq'

新增问卷id

See merge request !5

src/views/protocol/create-protocol.vue

@@ -206,6 +206,7 @@ export default {
           if( res && res.data ){
             vm.ruleForm.protocolName = res.data.protocolName;
             vm.ruleForm.content = res.data.contents;
+            vm.ruleForm.txWenJuanId = res.data.txWenJuanId;
             editor.setData(res.data.contents);
           }
         }else{

src/views/protocol/protocol-detail.vue

@@ -99,6 +99,7 @@ export default {
             vm.ruleForm.signNum = res.data.signNum;
             vm.ruleForm.createdName = res.data.createdName;
             vm.ruleForm.createTime = res.data.createTime;
+            vm.ruleForm.txWenJuanId = res.data.txWenJuanId;
             // detailEditor.setData(res.data.contents);
           }
         }else{