Commit Graph

271 Commits

Author SHA1 Message Date
079f679e13 Merge branch 'tolag3' 2024-12-24 10:35:35 +09:00
4255424855 Merge branch 'tolag3' 2024-12-24 10:34:03 +09:00
JIWOO
72a61e2359 이지우 - 협의회위원 페이지 동의버튼 추가 및 관리자 협의회관리 상세에 동의여부 및 일시 추가 2024-12-20 09:51:53 +09:00
JIWOO
fe5d7c2529 Merge branch 'JIWOO' 2024-12-19 18:04:41 +09:00
JIWOO
e4ce133525 이지우 - 협의회위원 화면에 동의하기 버튼 추가 2024-12-19 18:03:34 +09:00
myname
b5cb271069 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-19 15:47:06 +09:00
myname
60bab20b09 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 연동 기안 수정 작업
2024-12-19 15:46:40 +09:00
JIWOO
80b3eb4c34 Merge branch 'JIWOO' 2024-12-19 14:03:18 +09:00
JIWOO
1c1d7c3267 이지우 - 협의회위원 로그인 인증 추가 2024-12-19 14:01:47 +09:00
14069231ab Merge branch 'tolag3' 2024-12-19 11:40:19 +09:00
88784e93c3 Merge branch 'tolag3' 2024-12-19 11:39:51 +09:00
myname
9334421fe0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 기안문 내용 수정
2024-12-18 16:33:22 +09:00
myname
c6e93bdccd 2024-12-17 20:10 g/w 보완요구 3차 수정 2024-12-17 20:11:15 +09:00
myname
e6a7fd5baf 2024-12-17 18:02 기안문 내용 수정(출석1차) 2024-12-17 18:03:06 +09:00
myname
e85a8bfee2 2024-12-17 17:56 g/w 기안문 내용 수정 2024-12-17 17:56:59 +09:00
JIWOO
f19ea32e4e Merge branch 'JIWOO' 2024-12-17 12:11:23 +09:00
JIWOO
0bfee6646b 이지우 - 알림 발송 시점들 정리(주석으로 [민원인] or [조정원] 검색) 2024-12-17 12:08:18 +09:00
myname
84a8db7fe2 2024-12-17 11:56 g/w 기안문 수정 2024-12-17 11:56:37 +09:00
myname
c40e74b804 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

g/w 기안문 내용 수정
2024-12-17 11:40:26 +09:00
9c312e3f2d Merge branch 'tolag3' 2024-12-16 22:42:37 +09:00
f6fdba6869 Merge branch 'tolag3' 2024-12-16 22:40:32 +09:00
myname
ca0061e68e Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-16 20:46:25 +09:00
myname
85186ae6e8 2024-12-16 20:45 관인 기안 2024-12-16 20:46:02 +09:00
JIWOO
0d8cdd7613 Merge branch 'JIWOO' 2024-12-16 17:43:04 +09:00
JIWOO
698ebbf17a 이지우 - 사건 신청 시 팀장 담당으로 배정처리 2024-12-16 17:42:22 +09:00
myname
a68b09e96c Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-16 11:01:02 +09:00
myname
3150ead21a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-12-16 11:00:48 +09:00
bba7c5f4da Merge branch 'tolag3' 2024-12-16 09:48:18 +09:00
f99bd1567a Merge branch 'tolag3' 2024-12-16 09:47:48 +09:00
myname
9bfc02620a 2024-12-12 18:20 일반기안문 내용 수정 2024-12-12 18:21:19 +09:00
myname
485eb1a522 2024-12-12 16:35 중지시 일반 기안 연동 2024-12-12 16:36:07 +09:00
91fe8a3ac2 Merge branch 'tolag3' 2024-12-12 15:50:13 +09:00
53a984a740 Merge branch 'tolag3' 2024-12-12 15:49:49 +09:00
myname
54bb40402f 신청서 출력 2024-12-12 14:25:54 +09:00
myname
95ac1e0b43 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
신청서 출력
2024-12-12 12:52:05 +09:00
400a71c348 Merge branch 'tolag3' 2024-12-11 14:38:39 +09:00
7590a101bc Merge branch 'tolag3' 2024-12-11 14:38:11 +09:00
JIWOO
a4862dc20e Merge branch 'JIWOO' 2024-12-10 18:33:43 +09:00
JIWOO
ea364504fe 이지우 - 종료사건 상세조회 오류 수정 2024-12-10 18:32:01 +09:00
bca435a379 Merge branch 'tolag3' 2024-12-10 16:04:39 +09:00
6e446510cc Merge branch 'tolag3'
권한 및 메뉴관리 수정
2024-12-10 16:04:19 +09:00
myname
7bf4113dc7 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-10 12:30:09 +09:00
myname
30b4efca9e # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 동시기안문
2024-12-10 12:29:26 +09:00
bd7a0cef97 Merge branch 'tolag3' 2024-12-10 09:36:35 +09:00
27a558f7ce 애니사인, 나이스 기업조회 2024-12-10 09:36:07 +09:00
myname
252e52f1dd Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-09 19:08:54 +09:00
myname
313d6020c0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 동시기안
2024-12-09 19:08:30 +09:00
e745af6399 발송 개발 2024-12-09 17:29:25 +09:00
JIWOO
075ba27d3f 이지우 - 사용자 pdf 뷰어 작업 중 2024-12-09 17:00:57 +09:00
JIWOO
fa02d7bbce Merge branch 'JIWOO' 2024-12-09 12:10:34 +09:00
JIWOO
8ea2c24dd3 이지우 - 분쟁조정 사건 프로세스 진행 중 2024-12-09 12:09:13 +09:00
c5dc411286 Merge branch 'tolag3' 2024-12-09 09:55:42 +09:00
48a197de5c Merge branch 'tolag3' 2024-12-06 15:54:36 +09:00
24151e74a3 Merge branch 'tolag3' 2024-12-06 15:54:14 +09:00
myname
7ec3c6a6a8 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-06 14:56:14 +09:00
myname
dee3e7a0c5 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
g/w 연동 아이디 확인하고 진행하도록 처리함
2024-12-06 14:55:52 +09:00
3801e3665a Merge branch 'tolag3' 2024-12-06 12:38:07 +09:00
cf4af620b5 Merge branch 'master' of
http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-12-06 12:37:32 +09:00
JIWOO
6ee041ced8 이지우 - 사용자 사건조회 상세 작업 중 및 분쟁 처리 프로세스 테스트 2024-12-05 18:20:30 +09:00
JIWOO
57e18cb433 Merge branch 'JIWOO' 2024-12-05 14:21:20 +09:00
JIWOO
be4cd2272d 이지우 - 사용자 분쟁조정 사건조회 개발 중 2024-12-05 14:20:01 +09:00
myname
9afbd48870 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

gw 연동작업
2024-12-05 14:08:43 +09:00
myname
b5993e9942 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-04 17:47:26 +09:00
myname
fcf1e7aee2 2024-12-04 17:46 협의회 이관 종료 2024-12-04 17:47:05 +09:00
JIWOO
35c1444d60 Merge branch 'JIWOO' 2024-12-04 16:04:48 +09:00
JIWOO
e30577738b 이지우 - 사용자 마이페이지 / 관리자 배정 처리상세에 사건권한 승인요청 기능 개발 완료 2024-12-04 16:03:46 +09:00
myname
a120d26340 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

2024-12-04 14:01 g/w 작업
2024-12-04 14:02:04 +09:00
c2a451ce0a Merge branch 'master' of http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-12-03 21:18:08 +09:00
50e7d16575 Merge branch 'tolag3' 2024-12-03 21:18:01 +09:00
myname
50cf97f254 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

g/w 기안연동작업
2024-12-03 11:16:44 +09:00
4b428efd7f Merge branch 'tolag3' 2024-12-02 18:00:37 +09:00
f5daf33fcd Merge branch 'tolag3' 2024-12-02 18:00:14 +09:00
JIWOO
6752e78072 Merge branch 'JIWOO' 2024-12-02 17:44:24 +09:00
JIWOO
a63327b3f3 이지우 - 사용자 분쟁조정 신청, 임시보관 기능 완료 2024-12-02 17:42:53 +09:00
205d990e44 Merge branch 'tolag3' 2024-12-02 14:03:58 +09:00
e247cb2985 마이페이지 사건조회 추가 2024-12-02 14:03:35 +09:00
JIWOO
35b21ce72c 이지우 - 사용자 분쟁조정 신청 및 마이페이지 작업 중 2024-11-29 13:20:56 +09:00
JIWOO
4ba4b87764 Merge branch 'JIWOO' 2024-11-28 10:34:53 +09:00
JIWOO
9b60bdf35f 이지우 - 사용자 마이페이지 및 분쟁신청 작업 중 2024-11-28 10:31:57 +09:00
19d35acc5e Merge branch 'tolag3'
인증 끝
2024-11-27 16:54:05 +09:00
6568998f4e 인증 2024-11-27 12:06:04 +09:00
38a2c87129 Merge branch 'tolag3' 2024-11-27 10:47:43 +09:00
myname
5e81d7ffb6 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-26 19:15:16 +09:00
myname
14ec097e3a 2024-11-26 19:14 묶음 기안 2024-11-26 19:14:58 +09:00
JIWOO
074cd9384f Merge branch 'JIWOO' 2024-11-26 17:05:04 +09:00
JIWOO
bdb0be7efe 이지우 - 사용자 분쟁신청에 이노릭스 첨부파일 솔루션 추가 2024-11-26 17:04:00 +09:00
myname
8c2ed24b9a Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-26 13:59:27 +09:00
myname
c962dbcd20 2024-11-26 13:56 gw 연동 작업 2024-11-26 13:59:11 +09:00
JIWOO
c3ac71256d Merge branch 'JIWOO' 2024-11-25 18:41:19 +09:00
JIWOO
dc04618526 이지우 - 사용자 분쟁조정 신청 수정. 첨부파일 추가 예정 2024-11-25 18:37:24 +09:00
917a1f20fa Merge branch 'tolag3' 2024-11-25 12:47:07 +09:00
0cc72f0c28 Merge branch 'tolag3'
인증 개발
2024-11-25 12:46:43 +09:00
myname
db55521099 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

g/w 연동 수정
2024-11-25 09:56:58 +09:00
a9865ce89c Merge branch 'tolag3' 2024-11-21 17:13:42 +09:00
112eb5a640 Merge branch 'tolag3' 2024-11-21 17:13:08 +09:00
myname
6120143e26 2024-11-20 18:19 gw 수동 연동 처리 2024-11-20 18:20:03 +09:00
myname
25bf900b69 Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-11-20 10:03:27 +09:00
myname
97ce174b4a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

gw 콜백수동 처리
2024-11-20 10:03:11 +09:00
fb87ee35fe Merge branch 'tolag3' 2024-11-19 16:50:59 +09:00
b5fc6dfb48 Merge branch 'tolag3'
사용자 검색
2024-11-18 17:32:04 +09:00