MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205

Browse Source 
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataGeomEntity.java
This commit is contained in:
sanghyeonhd
2025-11-21 14:32:35 +09:00
parent ed004d61fa dec039e85b
commit 252ce26f7e
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/kamco/cd/kamcoback/postgres/entity/ErrorLogEntity.java
View File

@@ -31,7 +31,10 @@ public class ErrorLogEntity extends CommonCreateEntity {
private String errorCode;
private String errorMessage;
@Column(columnDefinition = "TEXT")
private String stackTrace;
private Long handlerUid;
private ZonedDateTime handledDttm;

9
src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataGeomEntity.java
View File

@@ -9,6 +9,7 @@ import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.validation.constraints.Size;
import java.time.Instant;
import java.time.ZonedDateTime;
import lombok.Getter;
import lombok.Setter;
@@ -60,14 +61,14 @@ public class MapSheetAnalDataGeomEntity {
@Column(name = "data_uid")
private Long dataUid;
@Column(name = "created_dttm", columnDefinition = "TIMESTAMP WITH TIME ZONE")
private Instant createdDttm;
@Column(name = "created_dttm")
private ZonedDateTime createdDttm;
@Column(name = "created_uid")
private Long createdUid;
@Column(name = "updated_dttm", columnDefinition = "TIMESTAMP WITH TIME ZONE")
private Instant updatedDttm;
@Column(name = "updated_dttm")
private ZonedDateTime updatedDttm;
@Column(name = "updated_uid")
private Long updatedUid;

9
src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalEntity.java
View File

@@ -9,6 +9,7 @@ import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.validation.constraints.Size;
import java.time.Instant;
import java.time.ZonedDateTime;
import lombok.Getter;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
@@ -42,10 +43,10 @@ public class MapSheetAnalEntity {
private String analMapSheet;
@Column(name = "anal_strt_dttm")
private Instant analStrtDttm;
private ZonedDateTime analStrtDttm;
@Column(name = "anal_end_dttm")
private Instant analEndDttm;
private ZonedDateTime analEndDttm;
@Column(name = "anal_ss")
private Integer analSs;
@@ -67,14 +68,14 @@ public class MapSheetAnalEntity {
@ColumnDefault("now()")
@Column(name = "created_dttm")
private Instant createdDttm;
private ZonedDateTime createdDttm;
@Column(name = "created_uid")
private Long createdUid;
@ColumnDefault("now()")
@Column(name = "updated_dttm")
private Instant updatedDttm;
private ZonedDateTime updatedDttm;
@Column(name = "updated_uid")
private Long updatedUid;