update Code Resolve Conflict

src/main/java/com/billpaymentservice/bbps/dto/CustomerParamDAO.java

@@ -7,8 +7,8 @@ import lombok.Setter;
 @Getter
 @Setter
 public class CustomerParamDAO {
-    @NotBlank private String paramsId;
-    @NotBlank private String name;
-    @NotBlank private String value;
-    private String type;
+     private String paramsId;
+     private String name;
+     private String value;
+     private String type;
 }

src/main/java/com/billpaymentservice/bbps/dto/response/FetchBillValidateResponse.java

@@ -1,5 +1,8 @@
 package com.billpaymentservice.bbps.dto.response;
 
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.CustomerParamDAO;
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -7,12 +10,14 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
-public class FetchBillValidatestResponse {
+@ToString
+public class FetchBillValidateResponse {
 
 	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	private GeneralResp genericResponse;
@@ -24,7 +29,7 @@ public class FetchBillValidatestResponse {
 	private String userId;
 	private String billerResponse;
 	private String additionalInfo;
-	private String customerParams;
+	private List<CustomerParamDAO> customerParams;
 	private String planInfoDaos;
 	private String creationDate;
 	private String modifiedDate;