|
|
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 |
|
|
|
142685f4c4
|
Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201
|
2026-01-05 14:46:48 +09:00 |
|
|
|
338e9c448c
|
라벨링작업 관리 목록조회 수정
|
2026-01-05 14:46:26 +09:00 |
|
|
|
9e7c73674f
|
Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
# src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java
# src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
# src/main/java/com/kamco/cd/kamcoback/label/service/LabelWorkService.java
# src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelWorkCoreService.java
# src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryCustom.java
# src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java
|
2026-01-05 14:45:03 +09:00 |
|
|
|
539831c712
|
라벨링작업 관리 목록조회 수정
|
2026-01-05 14:39:08 +09:00 |
|
Moon
|
2db7177edd
|
작업현황관리 리스트 API분리
|
2026-01-05 14:22:38 +09:00 |
|
|
|
375609c451
|
Merge pull request '라벨 이관 로직 수정' (#139) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/139
|
2026-01-05 14:14:10 +09:00 |
|
|
|
0978842400
|
라벨 이관 로직 수정
|
2026-01-05 14:13:24 +09:00 |
|
|
|
603d6aeb7d
|
Merge pull request 'merge 할 때 누락된 내용 추가 커밋' (#138) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/138
|
2026-01-05 13:55:36 +09:00 |
|
|
|
3bc801053a
|
merge 할 때 누락된 내용 추가 커밋
|
2026-01-05 13:54:51 +09:00 |
|
|
|
08002cd265
|
Merge pull request 'feat/dev_251201' (#137) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/137
|
2026-01-05 13:46:18 +09:00 |
|
|
|
a15b319bc2
|
spotless
|
2026-01-05 13:45:39 +09:00 |
|
DanielLee
|
78c8cb4a75
|
build error fix
|
2026-01-05 13:41:32 +09:00 |
|
DanielLee
|
af8d8c235c
|
Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
# Conflicts:
# src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java
# src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
|
2026-01-05 13:37:44 +09:00 |
|
DanielLee
|
462cdc0241
|
worklist delete
|
2026-01-05 13:37:30 +09:00 |
|
|
|
6d2d21b221
|
Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201
|
2026-01-05 13:36:36 +09:00 |
|
|
|
8c149605e5
|
spotless
|
2026-01-05 13:36:15 +09:00 |
|
|
|
6d8b3edf7b
|
Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
|
2026-01-05 13:36:15 +09:00 |
|
|
|
03d8114897
|
라벨링작업 관리 목록조회 수정
|
2026-01-05 13:36:07 +09:00 |
|
|
|
d86e70e27e
|
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/label/LabelAllocateApiController.java
# src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java
# src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java
# src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
|
2026-01-05 13:34:21 +09:00 |
|
|
|
f5fcc2a9e3
|
라벨러,검수자 상세 정보, 일자별 목록 쿼리 추가
|
2026-01-05 13:25:38 +09:00 |
|
DanielLee
|
877de7f17e
|
주석처리
|
2026-01-05 12:59:21 +09:00 |
|
DanielLee
|
ba0e408c2b
|
Build Error Fix
|
2026-01-05 12:45:50 +09:00 |
|
DanielLee
|
910c8754e6
|
Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
|
2026-01-05 12:42:19 +09:00 |
|
DanielLee
|
06d4b597cb
|
작업현황관리 Data accept fix
|
2026-01-05 12:42:10 +09:00 |
|
Moon
|
49e4346604
|
Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201
|
2026-01-05 12:41:24 +09:00 |
|
Moon
|
040aabe95e
|
작업현황 DTO수정
|
2026-01-05 12:41:07 +09:00 |
|
DanielLee
|
96f5a87b1a
|
작업현황관리 데이터 반환값 추가중
|
2026-01-05 12:33:48 +09:00 |
|
