Resolved merge conflict in BaseClass.java

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

@@ -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)

src/main/java/com/billpaymentservice/bbps/entites/BBPSMastersData.java

@@ -24,7 +24,7 @@ import lombok.Setter;
 public class BBPSMastersData extends Auditable<String> {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id")
 	private Long id;
 

src/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.jpa.properties.hibernate.default_schema=public
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
-spring.datasource.password=thakur@123
+spring.datasource.password=himanshu@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource