update: 解决冲突

src/views/ecm/marketing-event/components/lib-teltask.vue

@@ -54,7 +54,8 @@ export default {
       form: {
         title: '',
         lateDays: '',
-        content: ''
+        content: '',
+        invalidDay: 90
       },
       rules: {
         title: { required: true, type: 'string', message: '话务任务标题不能为空', trigger: 'blur' },
@@ -70,7 +71,8 @@ export default {
       this.form = {
         title: '',
         lateDays: '',
-        content: ''
+        content: '',
+        invalidDay: 90
       };
       if (val && this.item.ecmMarketingTypeRelationId) {
         console.log('编辑');