From 1e7b3c8a6b1c71193a1ea889697ed269629acf82 Mon Sep 17 00:00:00 2001 From: Lincpay Tech Date: Wed, 5 Nov 2025 10:45:50 +0530 Subject: [PATCH] Resolved merge conflict in BaseClass.java --- .../com/billpaymentservice/bbps/dto/request/BaseClass.java | 4 +--- .../com/billpaymentservice/bbps/entites/BBPSMastersData.java | 2 +- src/main/resources/application.properties | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java b/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java index f8094eb..aba2db5 100644 --- a/src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java +++ b/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) diff --git a/src/main/java/com/billpaymentservice/bbps/entites/BBPSMastersData.java b/src/main/java/com/billpaymentservice/bbps/entites/BBPSMastersData.java index 85f311e..660c166 100644 --- a/src/main/java/com/billpaymentservice/bbps/entites/BBPSMastersData.java +++ b/src/main/java/com/billpaymentservice/bbps/entites/BBPSMastersData.java @@ -24,7 +24,7 @@ import lombok.Setter; public class BBPSMastersData extends Auditable { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Long id; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 44ff981..6294285 100644 --- a/src/main/resources/application.properties +++ b/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