Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetMngEntity.java

@@ -50,5 +50,4 @@ public class MapSheetMngEntity {
   @ColumnDefault("'NULL::character varying'")
   @Column(name = "mng_path")
   private String mngPath;
-
 }

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberArchivedEntity.java

@@ -6,7 +6,7 @@ import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
-import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.util.UUID;
 import lombok.Getter;
 import lombok.Setter;
@@ -20,11 +20,10 @@ public class MemberArchivedEntity {
 
   @Id
   @Column(name = "uuid", nullable = false)
-  private UUID id;
+  private UUID uuid;
 
-  @NotNull
   @Column(name = "id", nullable = false)
-  private Long id1;
+  private Long id;
 
   @Size(max = 50)
   @Column(name = "employee_no", length = 50)
@@ -51,10 +50,10 @@ public class MemberArchivedEntity {
 
   @NotNull
   @Column(name = "created_dttm", nullable = false)
-  private OffsetDateTime createdDttm;
+  private ZonedDateTime createdDttm;
 
   @NotNull
   @ColumnDefault("now()")
   @Column(name = "archived_dttm", nullable = false)
-  private OffsetDateTime archivedDttm;
+  private ZonedDateTime archivedDttm;
 }

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MemberEntity.java

@@ -50,9 +50,9 @@ public class MemberEntity {
   private String email;
 
   @Size(max = 20)
-  @ColumnDefault("'ACTIVE'")
+  @ColumnDefault("'INACTIVE'")
   @Column(name = "status", length = 20)
-  private String status = "ACTIVE";
+  private String status = "INACTIVE";
 
   @Column(name = "created_dttm", nullable = false, insertable = false)
   private ZonedDateTime createdDttm;