Resolved merge conflict in BaseClass.java

2025-11-05 10:45:50 +05:30
parent 6ba817e54a
commit 1e7b3c8a6b
3 changed files with 3 additions and 5 deletions
@@ -25,11 +25,9 @@ public abstract class BaseClass {
 	@NotBlank(message = "Request ID cannot be null or blank")
 	private String reqId;
    
-    //private String txnId;
-   
    private DeviceDetail deviceDetial;

-    // ✅ 10 User Defined Fields (UDF1–UDF10)
+ 
    private String udf1;

    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)