Merge branch 'master' into develop

src/app/views/fuwutai/fuwutai.component.ts

@@ -3595,10 +3595,11 @@ export class FuwutaiComponent implements OnInit {
       if(this.buildType === '报修转事件'){
         postData.incident.fromWx = true;
       }
-      postData.incident = Object.assign({}, this.editOrder, postData.incident);
 
       if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
-        delete postData.incident.incidentsign;
+        postData.incident = Object.assign({}, postData.incident);
+      }else{
+        postData.incident = Object.assign({}, this.editOrder, postData.incident);
       }
     }
     console.log(postData);