BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflicts resolved

Browse Source
This commit is contained in:
harish
2024-08-26 12:29:18 +05:30
parent a45dd56432 049b53ac46
commit 9b5e6a4c5c
35 changed files with 341 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
View File

@@ -52,10 +52,10 @@ public class CallEntity extends BaseEntity {
private String submissionMethod;
@Column(name = "THRESHOLD", nullable = false)
private Integer threshold;
private Long threshold;
@Column(name="DOCUMENTATION_REQUESTED",columnDefinition = "TEXT")
private String documentation_requested;
private String documentationRequested;
@Column(name = "PRIORITY_AREA", columnDefinition = "TEXT")
private String priorityArea;

6
src/main/java/net/gepafin/tendermanagement/entities/RoleEntity.java
View File

@@ -11,7 +11,7 @@ import lombok.Setter;
@Setter
public class RoleEntity extends BaseEntity {
@Column(name = "ROLE_NAME", length = 50, nullable = true)
@Column(name = "ROLE_NAME", length = 255, nullable = true)
private String roleName;
@Column(name = "DESCRIPTION", length = 255, nullable = true)
@@ -19,8 +19,12 @@ public class RoleEntity extends BaseEntity {
@Column(name = "PERMISSIONS", length = 255, nullable = true)
private String permissions;
@ManyToOne
@JoinColumn(name = "REGION_ID", nullable = true)
private RegionEntity region;
@Column(name = "ROLE_TYPE", length = 255, nullable = true)
private String roleType;
}