去掉冲突

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

@@ -338,12 +338,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			return response;
 		}
 		// 检查面谈笔录是否提交
-<<<<<<< HEAD
+
 		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getProdId(),
 				contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
-=======
-		OrderFileEntity orderFile = orderFileRepository.getOrderFileWithCode(contractOrderEntity.getBusinessNo(), OrderFileConstant.TYPE_CODE_NOTE);
->>>>>>> 47d830245b3b258a0d0b40cc7bcce1c15b89786a
+
 		if (orderFile == null) {
 			response.fail(ResultCode.INTERVIEW_NOTE_UNSUBMIT);
 			return response;
@@ -712,12 +710,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 				put("6", "面谈笔录");
 			}
 		};
-<<<<<<< HEAD
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getProdId(),
-				req.getBusinessNo(), "1,2,3,4,5,6".split(","));
-=======
+
+
 		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getBusinessNo(),"1,2,3,4,5,6".split(","));
->>>>>>> 47d830245b3b258a0d0b40cc7bcce1c15b89786a
+
 		List<Map<String, String>> fileList = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
 			Map<String, String> content = new HashMap<>();