10-11-25 after conflict

src/main/java/com/billpaymentservice/bbps/controller/AgentController.java

@@ -3,7 +3,11 @@ package com.billpaymentservice.bbps.controller;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillFetchByBillIdRequest;

src/main/java/com/billpaymentservice/bbps/controller/MasterDataController.java

@@ -74,7 +74,6 @@ public class MasterDataController {
 
 		return ResponseEntity.ok(masterDataService.getCustomerParamByBillerId(customerParamRequest));
 	}
-
 	/**
 	 * Get All Master Data .The parameter is different from the data we are getting Made By Arham
 	 * in the MasterRequest

src/main/java/com/billpaymentservice/bbps/controller/PaymentController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillPaymentRequest;
-import com.billpaymentservice.bbps.dto.request.FetchBillRequest;
 import com.billpaymentservice.bbps.dto.request.TransactionStatusRequest;
 import com.billpaymentservice.bbps.service.PaymentService;