diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java b/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java
index 1acd87d..1e5d8fb 100644
--- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java
+++ b/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java
@@ -15,6 +15,7 @@ import java.time.Instant;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@IdClass(ComRiseSetBas.ComRiseSetBasId.class)
 @Entity
 @Table(name = "COM_RISE_SET_BAS")
 public class ComRiseSetBas {
@@ -23,23 +24,25 @@ public class ComRiseSetBas {
     @NoArgsConstructor
     @AllArgsConstructor
     @Builder
-    @Embeddable
     public static class ComRiseSetBasId implements Serializable {
 
         // 날짜
-        @Column(name = "LOC_DATE")
         private String locDate;
-
         // 지역
-        @Column(name = "LOCATION")
         private String location;
 
     }
 
 
-    // 날짜, 지역
-    @EmbeddedId
-    private ComRiseSetBasId id;
+    // 날짜
+    @Id
+    @Column(name = "LOC_DATE")
+    private String locDate;
+
+    // 지역
+    @Id
+    @Column(name = "LOCATION")
+    private String location;
 
     // 경도
     @Column(name = "LON")
diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java b/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java
index 4751fba..3e67ac9 100644
--- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java
+++ b/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java
@@ -14,6 +14,7 @@ import java.time.Instant;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@IdClass(FltCptAuthAdmDistrictRel.FltCptAuthAdmDistrictRelId.class)
 @Entity
 @Table(name = "FLT_CPT_AUTH_ADM_DISTRICT_REL")
 public class FltCptAuthAdmDistrictRel {
@@ -22,27 +23,31 @@ public class FltCptAuthAdmDistrictRel {
     @NoArgsConstructor
     @AllArgsConstructor
     @Builder
-    @Embeddable
     public static class FltCptAuthAdmDistrictRelId implements Serializable {
 
         // 관할기관코드
-        @Column(name = "CPT_AUTH_CODE")
         private String CPT_AUTH_CODE;
-
         // 행정코드
-        @Column(name = "ADM_CD")
         private String ADM_CD;
-
         // 구분
-        @Column(name = "TYPE")
         private String type;
 
     }
 
-    // 관할기관코드, 행정코드, 구분
-    @EmbeddedId
-    private FltCptAuthAdmDistrictRelId id;
+    // 관할기관코드
+    @Id
+    @Column(name = "CPT_AUTH_CODE")
+    private String CPT_AUTH_CODE;
+
+    // 행정코드
+    @Id
+    @Column(name = "ADM_CD")
+    private String ADM_CD;
 
+    // 구분
+    @Id
+    @Column(name = "TYPE")
+    private String type;
     // 수정일시
     @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP")
     private Instant UPDATE_DT;
diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/pty/model/PtyTermsDtl.java b/app/kac-app/src/main/java/kr/co/palnet/kac/data/pty/model/PtyTermsDtl.java
index dd3406c..8bb21ba 100644
--- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/pty/model/PtyTermsDtl.java
+++ b/app/kac-app/src/main/java/kr/co/palnet/kac/data/pty/model/PtyTermsDtl.java
@@ -14,6 +14,7 @@ import java.time.Instant;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@IdClass(PtyTermsDtl.PtyTermsDtlId.class)
 @Entity
 @Table(name = "PTY_TERMS_DTL")
 public class PtyTermsDtl {
@@ -22,20 +23,23 @@ public class PtyTermsDtl {
     @NoArgsConstructor
     @AllArgsConstructor
     @Builder
-    @Embeddable
     public static class PtyTermsDtlId implements Serializable {
         // 약관일련번호
-        @Column(name="TERMS_SNO")
         private int termsSno;
 
         // 언어구분코드
-        @Column(name="LANG_DIV_CD")
         private String langDivCd;
     }
 
-    // 약관일련번호, 언어구분코드
-    @EmbeddedId
-    private PtyTermsDtlId id;
+    // 약관일련번호
+    @Id
+    @Column(name = "TERMS_SNO")
+    private int termsSno;
+
+    // 언어구분코드
+    @Id
+    @Column(name = "LANG_DIV_CD")
+    private String langDivCd;
 
     // 약관제목명
     @Column(name = "TERMS_TITLE_NM")
diff --git a/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java
index e3d9947..aad9e0b 100644
--- a/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java
+++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComCdLangCtg.java
@@ -78,7 +78,6 @@ public class ComCdLangCtg {
     private LocalDateTime updateDt;
 
     @JsonIgnore
-    @MapsId("comCdBasId")
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumns(
             value = {