Commit Graph

1136 Commits

Author SHA1 Message Date
DanielLee
11444579e3 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2025-12-12 15:04:07 +09:00
DanielLee
ac3bdcb431 TIF 파일 유효성 검증 및 중복 파일 삭제 기능 적용 2025-12-12 15:03:37 +09:00
Moon
db45741829 영상관리 수정 2025-12-12 15:01:10 +09:00
Moon
9bf84e109d 영상관리 수정 2025-12-12 14:04:23 +09:00
Moon
6ec840e694 영상관리 추가 및 수정 2025-12-12 14:00:59 +09:00
Moon
d641c8e336 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java
#	src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.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
2025-12-12 13:59:39 +09:00
Moon
b76f2331f1 동영상관리 추가 및 수정 2025-12-12 13:58:35 +09:00
DanielLee
608d330a45 local settings change 2025-12-12 13:50:37 +09:00
2a6e530dd1 사용자 수정 상태값 추가 2025-12-12 11:50:23 +09:00
DanielLee
b76b0311d0 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java
2025-12-12 11:29:53 +09:00
DanielLee
11a94829f7 File Delete Add 2025-12-12 11:28:35 +09:00
d3ec9fdcaf 로그인전 미사용상태 체크 2025-12-12 11:27:13 +09:00
DanielLee
a231970903 파일 업로드 팝업, 중복파일 제거 팝업 기능 적용 2025-12-12 11:03:07 +09:00
54913d967f Merge pull request '비활성 상태 패스워드 비교 저장' (#51) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/51
2025-12-12 10:51:04 +09:00
baf6ca7758 비활성 상태 패스워드 비교 저장 2025-12-12 10:49:47 +09:00
e51f963af7 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2025-12-12 10:34:44 +09:00
88f49026b4 사용자 초기화 수정 2025-12-12 10:34:32 +09:00
Moon
dc0f0d9be8 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2025-12-12 10:27:58 +09:00
Moon
1f8eaf4911 use_inference 자료형 변경 2025-12-12 10:27:05 +09:00
5330fc6df5 관리자 유형 벨리데이트 수정 2025-12-12 10:15:32 +09:00
8cb664771a Merge pull request '권한 테스트 api 수정' (#50) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/50
2025-12-12 10:02:53 +09:00
f642f7c723 권한 테스트 api 수정 2025-12-12 10:02:23 +09:00
970d08ba44 권한 테스트 api 수정 2025-12-12 10:02:08 +09:00
790c212a11 Merge pull request 'AccessDeniedException 401 -> 403 으로 변경' (#49) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/49
2025-12-11 18:23:30 +09:00
79267e82d7 enum 수정 2025-12-11 17:56:47 +09:00
10e3c0ecbb 역할 enum 수정 2025-12-11 17:39:25 +09:00
993b36f42d Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2025-12-11 17:24:58 +09:00
DanielLee
5105fc855a Sportless Apply only 2025-12-11 17:23:48 +09:00
00afc93c4f AccessDeniedException 401 -> 403 으로 변경 2025-12-11 17:23:34 +09:00
Moon
91fb1d845f Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2025-12-11 17:16:58 +09:00
Moon
dbb0dea7ad 영상관리 수정 및 추가 2025-12-11 17:15:48 +09:00
1d8cc1b797 Merge pull request 'test api 추가, 개발서버 토큰 만료시간 조정' (#48) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/48
2025-12-11 17:07:05 +09:00
ce8534cf0f test api 추가, 개발서버 토큰 만료시간 조정 2025-12-11 17:06:36 +09:00
d18e4db060 test api 추가, 개발서버 토큰 만료시간 조정 2025-12-11 17:06:13 +09:00
7cc8e46056 권한 enum 수정 2025-12-11 15:58:38 +09:00
c9a450cec9 sysout 삭제 2025-12-11 15:54:39 +09:00
e610067513 Merge pull request 'feat/dev_251201' (#47) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/47
2025-12-11 15:40:04 +09:00
508565d2ec 공통코드 child where 조건 명시 추가 2025-12-11 15:38:37 +09:00
9d6cfc9d17 로그 저장 수정 2025-12-11 15:38:05 +09:00
9a1b21d888 Merge pull request '공통코드 id값 조회 쿼리 수정' (#46) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/46
2025-12-11 14:53:06 +09:00
ddd9af53da 공통코드 id값 조회 쿼리 수정 2025-12-11 14:52:11 +09:00
3ba06d28c8 Merge pull request '추론결과 demo URL 제거, 공통코드 fetchJoin 빼기' (#45) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/45
2025-12-11 14:40:26 +09:00
ec18d9d25b 추론결과 demo URL 제거, 공통코드 fetchJoin 빼기 2025-12-11 14:39:31 +09:00
07254d4bc7 Merge pull request '관리자 목록 조회 수정' (#44) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/44
2025-12-11 14:24:49 +09:00
ec87bddee8 관리자 목록 조회 수정 2025-12-11 14:24:22 +09:00
90d6ef9c05 관리자 목록 조회 수정 2025-12-11 14:24:14 +09:00
e34b717829 Merge pull request 'feat/dev_251201' (#43) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/43
2025-12-11 14:06:10 +09:00
507819b2e6 spotlessApply 적용 2025-12-11 14:05:26 +09:00
8ff0ae376d 로그인 예제 정보 변경 2025-12-11 13:58:07 +09:00
0b5976cb94 로그인 예제 정보 변경 2025-12-11 13:51:24 +09:00