解决冲突

pagesA/fire/fpd_detection/edit_detection/edit_detection.vue

@@ -375,6 +375,7 @@
 								url: fileLink,
 								name: fileLink
 							});
+							this.formData.att = fileLink
 							uni.showToast({
 								title: '文件上传成功！'
 							});