去掉无用代码

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -680,10 +680,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		FileInfoEntity fileInfoEntity = fileInfoService.getById(file.getImageId());
 		OrderFileEntity notaryOrderFile = new OrderFileEntity();
 		notaryOrderFile.setBusinessNo(file.getBusinessNo());
-<<<<<<< HEAD
-//		notaryOrderFile.setContractId(file.getContractId());
-=======
->>>>>>> f1d6c78a0b120e2f0f55b18f085c9efdfd0b9602
+
 		notaryOrderFile.setCode(code);
 		notaryOrderFile.setSignedPdfUrl(fileInfoEntity.getPath());
 		notaryOrderFile.setCreateTime(new Date());