MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
696 Commits 1 Branch 0 Tags
142685f4c4e6a18acd0f24b6885d5f837f361cea
Commit Graph

696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gayoun.park
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
teddy
338e9c448c 라벨링작업 관리 목록조회 수정 2026-01-05 14:46:26 +09:00
teddy
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
teddy
539831c712 라벨링작업 관리 목록조회 수정 2026-01-05 14:39:08 +09:00
Moon
2db7177edd 작업현황관리 리스트 API분리 2026-01-05 14:22:38 +09:00
gayoun.park
0978842400 라벨 이관 로직 수정 2026-01-05 14:13:24 +09:00
gayoun.park
3bc801053a merge 할 때 누락된 내용 추가 커밋 2026-01-05 13:54:51 +09:00
gayoun.park
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
gayoun.park
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
gayoun.park
8c149605e5 spotless 2026-01-05 13:36:15 +09:00
teddy
6d8b3edf7b Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 13:36:15 +09:00
teddy
03d8114897 라벨링작업 관리 목록조회 수정 2026-01-05 13:36:07 +09:00
gayoun.park
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
gayoun.park
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
gayoun.park
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
gayoun.park
b4ae6e148d 라벨할당 검수자 insert 로직 수정 2026-01-05 11:46:21 +09:00
DanielLee
67eb99e243 작업현황관리 수정 2026-01-05 11:41:50 +09:00
teddy
88cf9a4487 라벨링작업 관리 목록조회 수정 2026-01-05 10:37:17 +09:00
teddy
6a77d0f447 spotless 적용 2026-01-05 10:17:52 +09:00
teddy
829cb510e3 spotless 적용 2026-01-05 10:17:24 +09:00
teddy
4cea4bb2ed 학습관리 수정 2026-01-05 10:17:01 +09:00
teddy
0142da4f72 Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201 2026-01-05 10:05:05 +09:00
teddy
5eab38e1ea 학습관리 수정 2026-01-05 10:04:57 +09:00
gayoun.park
40daa738f6 라벨할당 로직에 도엽 추가, 라벨러 상세 정보 수정 2026-01-05 09:55:02 +09:00
gayoun.park
1cab1a34ab api 설명 변경 2026-01-05 09:15:13 +09:00
gayoun.park
d87048b4c6 라벨 할당,이관 리턴형식 수정 2026-01-05 08:54:01 +09:00
gayoun.park
dc2b9286f4 spotless 2026-01-02 22:18:09 +09:00
gayoun.park
a7b04d0be8 파라미터 yyyy기준으로 변경 2026-01-02 22:17:42 +09:00
Moon
c85dc1a070 라벨링 작업관리 목록 조회 수정 2026-01-02 22:03:33 +09:00
Moon
43c966d1b8 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-02 21:52:25 +09:00
Moon
9015de5c00 라벨링 작업 관리목록 조회 2026-01-02 21:51:44 +09:00
gayoun.park
b06c5a88ff spotless 2026-01-02 21:42:13 +09:00
gayoun.park
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
gayoun.park
89b1ea755f 라벨할당 수정, 상세 조회 API 2026-01-02 20:19:54 +09:00
DanielLee
513a2d3ebe 라벨러 목록조회 임시커밋 2026-01-02 19:16:00 +09:00
DanielLee
62c4b9e732 라벨러 목록조회 임시커밋 2026-01-02 18:59:16 +09:00