Commit Graph

915 Commits

Author SHA1 Message Date
d184f4033f Merge pull request 'my menus 권한 수정' (#151) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/151
2026-01-05 18:31:42 +09:00
1af9b87f82 my menus 권한 수정 2026-01-05 18:31:18 +09:00
154bc11007 change 공유폴더 2026-01-05 18:01:38 +09:00
f355253c9f Merge pull request 'feat/dev_251201' (#150) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/150
2026-01-05 17:53:56 +09:00
2cda32e96f 라벨할당 로직 수정 2026-01-05 17:53:06 +09:00
Moon
0ae9a55c91 작업현황목록수정 2026-01-05 17:51:23 +09:00
67205f2a86 Merge pull request 'feat/dev_251201' (#149) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/149
2026-01-05 17:37:29 +09:00
af87a452a3 spotless 2026-01-05 17:36:53 +09:00
Moon
105d844d4a Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 17:35:30 +09:00
Moon
4839fbc824 영상관리엔티티수정 2026-01-05 17:34:38 +09:00
DanielLee
366262099c UUID 최신순으로 전체 조회 2026-01-05 17:28:19 +09:00
777d28d79e Merge pull request 'feat/dev_251201' (#148) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/148
2026-01-05 17:21:44 +09:00
admin
cc287fdb89 Merge pull request 'feat/dean/test-scene' (#147) from feat/dean/test-scene into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/147
2026-01-05 17:19:17 +09:00
beb4846bff Merge branch 'develop' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/dean/test-scene 2026-01-05 17:18:51 +09:00
0537f67e93 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 17:17:38 +09:00
85ad31af34 라벨링 할당,이관 파라미터 형태 변경, userDetail 리턴 항목 추가 2026-01-05 17:17:23 +09:00
ef78498d84 feat: 추론요청 json 2026-01-05 17:15:43 +09:00
531108d077 라벨링작업 관리 > 목록 조회 수정 2026-01-05 17:14:03 +09:00
05ecc6d7db Merge pull request '라벨링작업 관리 > 목록 조회 수정' (#146) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/146
2026-01-05 17:04:19 +09:00
239f9ecab6 라벨링작업 관리 > 목록 조회 수정 2026-01-05 17:03:17 +09:00
47ab483d42 json 형식 2026-01-05 17:00:35 +09:00
8bf404d257 feat: test code 2026-01-05 16:53:01 +09:00
f1841b0107 Merge branch 'develop' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/dean/test-scene 2026-01-05 16:50:12 +09:00
a7c0eb9fad Merge pull request '작업현황 관리 조회 수정' (#145) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/145
2026-01-05 16:39:58 +09:00
6e1ad0a944 작업현황 관리 조회 수정 2026-01-05 16:39:32 +09:00
6471314b17 Merge pull request 'feat/dev_251201' (#144) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/144
2026-01-05 16:33:30 +09:00
c30deb5efe spotless 2026-01-05 16:32:57 +09:00
931e43ad43 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 16:31:59 +09:00
eb47698c2f labelState 조건 수정 2026-01-05 16:31:43 +09:00
DanielLee
bd1f82a5d0 Bring Data fix 2026-01-05 16:25:38 +09:00
27d33dac3b 이노펨 mockup api 수정 2026-01-05 16:09:56 +09:00
d8da066d59 Merge pull request 'feat/dev_251201' (#143) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/143
2026-01-05 16:09:03 +09:00
a86c0b5c4a spotless 2026-01-05 16:08:15 +09:00
Moon
a7464c7ea4 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 16:06:18 +09:00
Moon
c76a0dff1e 라벨상태DTO수정 2026-01-05 16:05:56 +09:00
DanielLee
023ac5be49 name change 2026-01-05 16:00:59 +09:00
DanielLee
4438d20430 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 15:54:37 +09:00
DanielLee
0595f9ad5b projectInfo 조회 추가 2026-01-05 15:54:22 +09:00
a450112b7b Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 15:43:14 +09:00
d8f97c1137 이노펨 mockup api 수정 2026-01-05 15:43:05 +09:00
a03fcad671 Merge pull request '라벨할당 로직 수정(검수자는 나중에 배치로 업데이트)' (#142) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/142
2026-01-05 15:42:17 +09:00
133b22d299 라벨할당 로직 수정(검수자는 나중에 배치로 업데이트) 2026-01-05 15:41:32 +09:00
a74416cfdf Merge pull request 'feat/dev_251201' (#141) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/141
2026-01-05 15:20:04 +09:00
0129dcacc5 spotless 2026-01-05 15:19:15 +09:00
Moon
e3aa0abfde Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
2026-01-05 15:16:59 +09:00
Moon
ed075e47bd 작업현황리스트 수정 2026-01-05 15:16:09 +09:00
74025fb729 Merge pull request 'feat/dev_251201' (#140) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/140
2026-01-05 15:04:10 +09:00
067862ff12 라벨링작업 관리 목록조회 수정 2026-01-05 15:01:51 +09:00
7acfd32b49 merge 2026-01-05 14:54:42 +09:00
DanielLee
053d337314 build error fix
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
2026-01-05 14:52:46 +09:00