Commit Graph

110 Commits

Author SHA1 Message Date
myname
2d71d94c3e # 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-24 10:39:18 +09:00
079f679e13 Merge branch 'tolag3' 2024-12-24 10:35:35 +09:00
4255424855 Merge branch 'tolag3' 2024-12-24 10:34:03 +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
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
85186ae6e8 2024-12-16 20:45 관인 기안 2024-12-16 20:46: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
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
JIWOO
a4862dc20e Merge branch 'JIWOO' 2024-12-10 18:33:43 +09:00
JIWOO
ea364504fe 이지우 - 종료사건 상세조회 오류 수정 2024-12-10 18:32:01 +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
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
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
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
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
myname
14ec097e3a 2024-11-26 19:14 묶음 기안 2024-11-26 19:14:58 +09:00
myname
c962dbcd20 2024-11-26 13:56 gw 연동 작업 2024-11-26 13:59:11 +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
myname
6120143e26 2024-11-20 18:19 gw 수동 연동 처리 2024-11-20 18:20:03 +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
myname
c97688d0f0 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

착수 보고 상신 작업
2024-11-15 16:43:13 +09:00
myname
0169a7caa3 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

alert 제거
2024-11-14 10:39:04 +09:00
myname
e3a8d94f11 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-11-13 18:26:09 +09:00
myname
94e43760c9 2024-11-05 14:41 통계정보 수정 2024-11-05 14:41:53 +09:00
myname
1132b5acf9 # WARNING: head commit changed in the meantime
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

기관경과 사건현황
2024-11-05 09:51:29 +09:00
myname
378a192e4d 2024-10-31 19:38 통계 쿼리 추가 2024-10-31 19:38:42 +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
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
JIWOO
19840ab38b 이지우 - 그룹웨어 테스트 중 2024-09-30 16:17:56 +09:00
JIWOO
7bcb0ee0f1 이지우 - SeedCriteria > Criteria 이름 변경(SeedCriteria 사용 시 ajax 오류) 2024-09-23 11:07:25 +09:00
myname
0444c90d8b 2024-09-12 14:43 관리자 게시판 작업 2024-09-12 14:43:35 +09:00
JIWOO
6ebadbace4 이지우 - 관리자 분쟁 신청 등록 작업 중 2024-09-06 16:54:14 +09:00
JIWOO
3fabc13218 이지우 - 코드조회 AJAX 오류 수정 2024-09-05 18:13:01 +09:00
JIWOO
395bf2c4e9 이지우 - 관리자 분쟁신청 등록 작업 중 2024-09-04 18:30:23 +09:00
user
f2c0cc76d5 2024-08-30 코드관리 작업 중 2024-08-30 15:30:20 +09:00
JIWOO
4f76afe32f 이지우 - 분쟁사건 처리관리 작업 중 2024-08-29 17:09:49 +09:00