update code resolve conflict

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

@@ -0,0 +1,55 @@
+package com.billpaymentservice.bbps.entites;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "payment_start_record")
+public class PaymentStartRecord {
+
+		@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+    
+  @Column(name = "request_id", unique = true, nullable = false)
+   private String requestId;
+   @Column(name = "client_mid", nullable = false)
+   private String clientMid;
+   
+   @Column(name = "client_user_id")
+   private String clientUserId;
+   
+   @Column(name = "internal_txn_id", unique = true, nullable = false)
+   private String internalTxnId;
+   
+	@Column(name = "order_no", unique = true, nullable = false)
+	private String orderNo;
+
+	@Column(name = "amount", nullable = false)
+	private String amount;
+
+	@Column(name = "mid", nullable = false)
+	private String mid;
+
+	@Column(name = "txn_id", unique = true, nullable = false)
+	private String txnId;
+
+	@Column(name = "qr_string", columnDefinition = "TEXT")
+	private String qrString;
+
+	@Column(name = "created_on", nullable = false)
+	private String createdOn;
+}