Resolved merge conflict in BaseClass.java
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user