update Resolve Conflict

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

@@ -1,13 +1,25 @@
 package com.billpaymentservice.bbps.dto;
 
-import jakarta.validation.constraints.NotBlank;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Getter
 @Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CustomerParamDAO {
-     private String paramsId;
+     public CustomerParamDAO(String name, String value, String type) {
+		
+    	this.name = name;
+    	this.value = value;
+    	this.type = type;
+	}
+	 private String paramsId;
      private String name;
      private String value;
      private String type;

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

@@ -0,0 +1,40 @@
+package com.billpaymentservice.bbps.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ViewComplaintDTO {
+	private String assignedTo;
+    private String comment;
+    private String complaintDescr;
+    private String complaintDispos;
+    private String complaintId;
+    private String complaintNpciId;
+    private String complaintRaisedFrom;
+    private String complaintType;
+    private String createdEpochDate;
+    private String creationDate;
+    private String estimated_TAT;
+    private String modifiedDate;
+    private String modifiedEpochDate;
+    private String refId;
+    private String status;
+    private String txnId;
+    private String userId;
+    private String category;
+    private String billerName;
+    private String txnAmount;
+    private String totalTxnAmount;
+    private String complaintStatus;
+    private String superLevelEsc;
+    private String openComplaint;
+    private String reopenComplaint;
+    private String remarks;
+    private String agentId;
+
+}

src/main/java/com/billpaymentservice/bbps/dto/request/ViewComplainByIdRequest.java

@@ -0,0 +1,13 @@
+package com.billpaymentservice.bbps.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ViewComplainByIdRequest extends BaseClass {
+
+  @NotBlank(message = "Complain ID cannot be blank")
+  private String complaintId;
+}

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

@@ -0,0 +1,20 @@
+package com.billpaymentservice.bbps.dto.response;
+
+import java.util.List;
+
+import com.billpaymentservice.bbps.dto.GeneralResp;
+import com.billpaymentservice.bbps.dto.ViewComplaintDTO;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ViewComplainByIdResponse {
+	  private List<ViewComplaintDTO> complaintsList;
+	    private GeneralResp generalResp;
+	    private int pageNo;
+	    private int pageSize;
+	    private int totalPages;
+	    private int totalElements;
+}