conflict resolved by mohd arham

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

@@ -5,10 +5,12 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString
 public class DeviceDetail {
 	
 	private List<Detail> detail;

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

@@ -3,59 +3,52 @@ package com.billpaymentservice.bbps.dto.request;
 import com.billpaymentservice.bbps.dto.DeviceDetail;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter 
 @Setter 
 @AllArgsConstructor 
 @NoArgsConstructor
+@ToString
 public abstract class BaseClass {
 
-    // ✅ Request me required, response me hide honge
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	@NotBlank(message = "MID cannot be null or blank")
     private String mid;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    private String secretKey;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	
+	@NotBlank(message = "Secret key cannot be null or blank")
+	private String secretKey;
+	@NotBlank(message = "Request ID cannot be null or blank")
+	private String reqId;
+    
     private String txnId;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+   
     private DeviceDetail deviceDetial;
 
     // ✅ 10 User Defined Fields (UDF1–UDF10)
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf1;
 
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf2;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf3;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf4;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf5;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf6;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ 
     private String udf7;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf8;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf9;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf10;
 }
 

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

@@ -3,9 +3,11 @@ package com.billpaymentservice.bbps.dto.request;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@ToString(callSuper = true)
 public class BillerDetailRequest extends BaseClass{
      
 	@NotNull