Commit Graph

149 Commits

Author SHA1 Message Date
JIWOO
510c2e1c17 이지우 > 관리자 > 분쟁조정관련서식 > 기존 다운로드 구현 완료 및 2024-10-29 18:34:05 +09:00
JIWOO
fa9585dc14 Merge branch 'JIWOO' 2024-10-29 10:21:03 +09:00
JIWOO
784d13d3fd 이지우 - 이노릭스 작업 중 2024-10-29 10:16:32 +09:00
myname
9b6f7a3a2a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

로그 정보
2024-10-28 17:39:02 +09:00
myname
7f520742f1 Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
2024-10-25 12:46:19 +09:00
myname
d4beed6aa3 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

분쟁조정 사례수정 & DB ip 변경
2024-10-25 12:28:35 +09:00
160dfdd6be Merge branch 'tolag3' 2024-10-25 09:44:45 +09:00
c2acfa2f38 Merge branch 'tolag3' 2024-10-25 09:36:57 +09:00
JIWOO
2e22fabb73 Merge branch 'JIWOO'
Conflicts:
	src/main/resources/egovframework/egovProps/globals_local.properties
2024-10-23 16:18:30 +09:00
JIWOO
365c594e84 이지우 - 그룹웨어 경로 구분 추가 2024-10-23 16:14:08 +09:00
myname
bbc21324bc # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-23 09:50:53 +09:00
JIWOO
67c73ed88a Merge branch 'JIWOO' 2024-10-21 09:53:26 +09:00
JIWOO
9b8b1406aa 이지우 - 분쟁조정 프로세스 작업 중 2024-10-21 09:51:34 +09:00
myname
ea91cb312d # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-18 17:50:06 +09:00
625673278b Merge branch 'tolag3' 2024-10-17 17:41:21 +09:00
20754aab98 Merge branch 'tolag3'
팝업관리 게시판관리 개발
2024-10-17 17:41:07 +09:00
myname
a24dc2a89d # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-17 17:30:37 +09:00
b9f5505393 Merge branch 'tolag3'
오류 수정
2024-10-17 10:15:27 +09:00
ccc878dd0e Merge branch 'tolag3' 2024-10-16 09:41:20 +09:00
ccb250b5d9 Merge branch 'tolag3'
조정신청 개발중
본인인증 개발중
2024-10-16 09:40:57 +09:00
myname
2364734e77 Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Conflicts:
	src/main/resources/egovframework/sqlmap/let/uss/ion/cnt/CntManage_SQL_Oracle.xml
2024-10-15 11:10:02 +09:00
myname
97690f6015 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-15 11:07:23 +09:00
858987855b Merge branch 'tolag3' 2024-10-15 10:31:42 +09:00
c374bbb783 Merge branch 'tolag3'
본인인증 개발중
2024-10-15 10:30:51 +09:00
JIWOO
c786164e8c 이지우 - 관리자 분쟁조정 처리 작업 완료(그룹웨어, FAX, SMS, 첨부파일 등 공통 영역 제외) 2024-10-14 17:35:08 +09:00
myname
e7083a2e41 2024-10-11 17:33 관리자 통합검색 페이지 연결 2024-10-11 17:33:22 +09:00
myname
8057ad755a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

마이페이지 소스 수정
2024-10-11 16:09:44 +09:00
30162f3676 Merge branch 'tolag3' 2024-10-10 18:26:22 +09:00
83ccbdfac3 Merge branch 'tolag3'
메인화면 마무리
2024-10-10 18:26:03 +09:00
myname
24611c673a # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-10-10 17:08:50 +09:00
a5d86edb83 Merge branch 'tolag3' 2024-10-10 17:00:34 +09:00
9bf98ca135 메인화면 개발 2024-10-10 16:59:47 +09:00
JIWOO
12d493b806 Merge branch 'JIWOO' 2024-10-10 15:12:51 +09:00
JIWOO
e297ad6265 이지우 - 관리자 분쟁처리 작업 중 및 코드 상수 파일 생성 2024-10-10 15:09:56 +09:00
036d9c6ae8 어드민 레이아웃 수정 2024-10-07 16:08:14 +09:00
4f5d92adf7 Merge branch 'tolag3' 2024-10-07 12:47:12 +09:00
88bc1057dc 관리자 수정중 2024-10-07 12:46:55 +09:00
JIWOO
9e8fa154fa Merge branch 'JIWOO' 2024-10-07 12:26:56 +09:00
JIWOO
db55f294f9 이지우 - 관리자 분쟁조정 처리 작업 중 2024-10-07 12:21:43 +09:00
myname
32260c8b6d Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-10-02 18:31:00 +09:00
myname
bc0275e74b 2024-10-02 18:30 마이페이지 작업 2024-10-02 18:30:38 +09:00
385c699809 Merge branch 'tolag3' 2024-10-02 12:18:21 +09:00
45e8faf6a7 사용자 left munu 수정 2024-10-02 12:18:05 +09:00
myname
5252ef506c Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 2024-10-02 11:55:10 +09:00
myname
da8e0986c8 2024-10-02 11:53 분쟁조정 안내 작업 2024-10-02 11:54:28 +09:00
269463560b Merge branch 'master' of
http://tolag3@vcs.iten.co.kr:9999/itnAdmin/fairnet

 본인인증 개발중
2024-09-30 17:23:01 +09:00
JIWOO
2dfbcd1fee Merge branch 'JIWOO' 2024-09-30 16:27:51 +09:00
JIWOO
19840ab38b 이지우 - 그룹웨어 테스트 중 2024-09-30 16:17:56 +09:00
4f3563e347 본인인증 개발중 2024-09-30 15:48:44 +09:00
myname
3dfa378653 2024-09-30 11:37 분쟁조정상담 작업 2024-09-30 11:38:13 +09:00