Commit Graph

32 Commits

Author SHA1 Message Date
3bc801053a merge 할 때 누락된 내용 추가 커밋 2026-01-05 13:54:51 +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
06d4b597cb 작업현황관리 Data accept fix 2026-01-05 12:42:10 +09:00
6f089decf9 Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201 2026-01-05 11:46:43 +09:00
b4ae6e148d 라벨할당 검수자 insert 로직 수정 2026-01-05 11:46:21 +09:00
DanielLee
67eb99e243 작업현황관리 수정 2026-01-05 11:41:50 +09:00
40daa738f6 라벨할당 로직에 도엽 추가, 라벨러 상세 정보 수정 2026-01-05 09:55:02 +09:00
d87048b4c6 라벨 할당,이관 리턴형식 수정 2026-01-05 08:54:01 +09:00
dc2b9286f4 spotless 2026-01-02 22:18:09 +09:00
a7b04d0be8 파라미터 yyyy기준으로 변경 2026-01-02 22:17:42 +09:00
b06c5a88ff spotless 2026-01-02 21:42:13 +09:00
e80144d5fc 라벨 이관, 상세정보 API 추가 2026-01-02 21:41:40 +09:00
DanielLee
358d932e96 개선작업 2026-01-02 21:20:46 +09:00
DanielLee
3a458225c9 Build Error Fix 2026-01-02 21:07:14 +09:00
Moon
f742aa91a4 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-02 21:00:22 +09:00
Moon
cc5015213b 라벨링작업관리 리스트 추가 2026-01-02 20:59:19 +09:00
89b1ea755f 라벨할당 수정, 상세 조회 API 2026-01-02 20:19:54 +09:00
DanielLee
62c4b9e732 라벨러 목록조회 임시커밋 2026-01-02 18:59:16 +09:00
fd5d0976fc 할당 가능한 라벨러, 검수자 목록 API 2026-01-02 18:17:46 +09:00
d72e9de61e 라벨할당 임시 커밋 2026-01-02 17:58:25 +09:00
c65a3be807 라벨 자동할당 update 로직 -> 추후 라벨링 할당 테이블로 변경할 예정 2025-12-31 12:20:10 +09:00
0df6151777 spotless 적용 2025-12-31 09:25:30 +09:00
0f7dda261b 라벨 자동할당 로직 임시 커밋 2025-12-31 09:10:11 +09:00