update code resolved conflict

2025-11-21 10:55:54 +05:30
parent bd9d544b6c 0ae072dce4
commit bb38775e5b
32 changed files with 964 additions and 419 deletions
@@ -20,7 +20,18 @@ import lombok.ToString;
@Getter
@Setter
@Entity
-@ToString
+@ToString(exclude = {
+	    "billerPaymentModes",
+	    "billerPaymentChannels",
+	    "billerCustomerParams",
+	    "customerParamGroups",
+	    "billerResponseParams",
+	    "billerAdditionalInfos",
+	    "interchangeFeeConves",
+	    "interchangeFees",
+	    "billerPlanResponseParams"
+	})
+
@Table(name = "biller_details")
@JsonIgnoreProperties(ignoreUnknown = true)
 public class BillerDetails {
@@ -140,10 +151,12 @@ public class BillerDetails {
    @OneToMany(mappedBy = "biller", cascade = CascadeType.ALL, orphanRemoval = true)
    private List<AdditionalInfo> billerAdditionalInfos;

+	
 	/*
-	 * @OneToMany(mappedBy = "biller", cascade = CascadeType.ALL, orphanRemoval =
-	 * true) private List<AdditionalInfo> billerAdditionalInfoPayments;
-	 */
+		 * OneToMany(mappedBy = "biller", cascade = CascadeType.ALL, orphanRemoval
+		 * =true) private List<AdditionalInfo> billerAdditionalInfoPayments;
+		 */
+	 
    @OneToMany(mappedBy = "biller", cascade = CascadeType.ALL, orphanRemoval = true)
    private List<InterchangeFeeConf> interchangeFeeConves;

@@ -26,7 +26,7 @@ public class ComplaintStatusDetails extends Auditable<String>{

 	@Column(name = "txn_id")
 	private String systemTxnId;
-
+	
 	@Column(name = "total_elements")
 	private String totalElements;