Resolved conflicts
This commit is contained in:
@@ -82,4 +82,6 @@ public class ApplicationEntity extends BaseEntity {
|
||||
@Column(name = "EMAIL_JSON")
|
||||
private String emailJson;
|
||||
|
||||
@Column(name = "PREVIOUS_STATUS")
|
||||
private String previousStatus;
|
||||
}
|
||||
Reference in New Issue
Block a user