Merge remote-tracking branch 'origin/master' into master

src/views/dashboard/index.vue

@@ -336,7 +336,8 @@ export default {
         remark: null,
         taskId: null,
         currentStep: null,
-        filess: []
+        filess: [],
+        content:null
       },
       enforceFlow: {
         name: '',
@@ -365,7 +366,7 @@ export default {
       editor.config.height = 300
       editor.create()
       editor.config.onchange = (html) => {
-        this.editorContent=editor.txt.html()
+        this.enforceForm.content=editor.txt.html()
       };
     },
     getDeptUserTrees() {