diff --git a/.gitignore b/.gitignore index 24725d6..d914762 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ target transaction-logs .flattened-pom.xml secrets.yml +src/main/resources/application-local.yml .gradletasknamecache .sts4-cache diff --git a/src/main/java/com/iconplus/smartproc/model/entity/JenisPengadaan.java b/src/main/java/com/iconplus/smartproc/model/entity/JenisPengadaan.java index 074a799..52980b0 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/JenisPengadaan.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/JenisPengadaan.java @@ -17,7 +17,7 @@ public class JenisPengadaan extends BaseEntity { @Column(name = "id") private long id; - @Column(name = "jenis_anggaran") + @Column(name = "jenis_pengadaan") private String jenisPengadaan; @Column(name = "keterangan") diff --git a/src/main/java/com/iconplus/smartproc/model/entity/Permission.java b/src/main/java/com/iconplus/smartproc/model/entity/Permission.java index 9d54f1a..76aeb2e 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/Permission.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/Permission.java @@ -32,7 +32,7 @@ public class Permission extends BaseEntity { @Column(name = "role_id") private Long roleId; - @Column(name = "role_id") + @Column(name = "menu_id") private Long menuId; @Column(name = "deleted") diff --git a/src/main/java/com/iconplus/smartproc/model/entity/SumberDana.java b/src/main/java/com/iconplus/smartproc/model/entity/SumberDana.java index 7922d18..cdae9d1 100644 --- a/src/main/java/com/iconplus/smartproc/model/entity/SumberDana.java +++ b/src/main/java/com/iconplus/smartproc/model/entity/SumberDana.java @@ -8,7 +8,7 @@ import org.hibernate.annotations.Type; import javax.persistence.*; @Entity -@Table(name = "sumberdana") +@Table(name = "sumber_dana") @Data @Builder public class SumberDana extends BaseEntity { diff --git a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/PostCreateJenisAnggaranService.java b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/PostCreateJenisAnggaranService.java index 165699d..6e5d17a 100644 --- a/src/main/java/com/iconplus/smartproc/service/jenisanggaran/PostCreateJenisAnggaranService.java +++ b/src/main/java/com/iconplus/smartproc/service/jenisanggaran/PostCreateJenisAnggaranService.java @@ -49,4 +49,4 @@ public class PostCreateJenisAnggaranService implements BaseService