Commit Graph

149 Commits

Author SHA1 Message Date
yoon
733389a2a3 Merge branch 'main' into yoon 2025-02-17 14:29:06 +09:00
yoon
ac5629c155 get -> select 2025-02-17 14:28:40 +09:00
103768d903 Merge branch 'khj' into main 2025-02-17 13:16:39 +09:00
5d791bbb3e 투표 추가 2025-02-17 13:16:09 +09:00
yoon
56edd2bc41 Merge branch 'main' into yoon 2025-02-17 10:33:17 +09:00
yoon
f33fd48eef 프로젝트 목록 리스트 2025-02-17 10:32:53 +09:00
yoon
aeb96802f9 getInt 추가 2025-02-17 10:32:40 +09:00
yoon
40932759a9 필요없는 로직 삭제 2025-02-17 10:32:29 +09:00
yoon
5539432b61 주석 변경 2025-02-17 10:31:58 +09:00
1563e9409a 휴가관리 기능 추가 2025-02-14 16:23:33 +09:00
9612b091ba 게시판,휴가 수정 2025-02-14 14:06:05 +09:00
e9c007d081 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-13 16:24:46 +09:00
ea3ce3b517 휴가관리 사원 연차사용정보 추가 2025-02-13 16:24:38 +09:00
yoon
2641cb258f "/api/project/**", ROLE_MEMBER 추가 2025-02-13 15:19:35 +09:00
yoon
7c3f646b36 updateColorYon map으로 변경 2025-02-13 15:19:04 +09:00
712ae8e9c2 개발용 세션 쿠키 내리기
차후 삭제*
2025-02-13 11:55:48 +09:00
0d6594b439 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-13 11:44:32 +09:00
87215dba93 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-11 16:18:52 +09:00
6456a6d1c8 휴가 수정 2025-02-11 16:18:45 +09:00
yoon
16ce027be9 project 경로 member 권한 추가 (테스트) 2025-02-11 09:55:39 +09:00
yoon
0779f6a2c8 프로젝트 년도 불러오기 2025-02-11 09:55:19 +09:00
bb886bf0cf d 2025-02-10 15:55:45 +09:00
331b5d53f5 s 2025-02-10 15:13:37 +09:00
2d0e4a9b5a 22 2025-02-10 14:33:15 +09:00
d8c653618c memberseq 임의값으로 수정(임시) 2025-02-10 14:28:44 +09:00
8d88545c2b Merge branch 'khj' into main 2025-02-10 10:53:14 +09:00
9c61c36928 용어집 userid 임시 2025-02-10 10:52:52 +09:00
yoon
691ffbff94 기존 비밀번호 체크 2025-02-10 10:18:57 +09:00
d1fc85c0f6 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-07 18:44:50 +09:00
87a9240a97 휴가관리,보드컨트롤러 수정 2025-02-07 16:20:03 +09:00
f8da4b8b0b Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-07 16:08:42 +09:00
bbb1bc4eae 게시판 로그링정보 수정 2025-02-07 15:25:28 +09:00
yoon
8fa323414a map으로 변경 2025-02-07 14:49:08 +09:00
d8f36fbf17 Merge branch 'khj' into main 2025-02-07 14:13:01 +09:00
32c0b31b5d 파람수정 2025-02-07 14:12:36 +09:00
yoon
fe9ac2f2e1 Merge branch 'main' into yoon 2025-02-07 14:08:27 +09:00
yoon
1a3c1333e3 게시판 권한 설정 2025-02-07 14:05:46 +09:00
yoon
7cadf7722d 필요없는 코드 삭제 2025-02-07 14:04:58 +09:00
78329b0502 필요ㅓ없는 코드삭제 2025-02-07 14:03:23 +09:00
275fe94c5a 용어집 수정 2025-02-07 14:01:57 +09:00
yoon
019300e662 Merge branch 'main' into yoon 2025-02-06 14:27:07 +09:00
yoon
74272f3233 비밀번호 재설정 2025-02-06 14:22:09 +09:00
yoon
7b32de158b 비밀번호 힌트 목록 불러오기 2025-02-06 14:21:31 +09:00
7dea689165 게시판 수정 2025-02-04 16:08:03 +09:00
50d3787a69 공통코드사용 수정 2025-02-03 16:16:46 +09:00
849b99e475 보드수정 2025-02-03 15:33:02 +09:00
358e12a222 유저 목록 수정 2025-02-03 15:09:30 +09:00
yoon
856dd1b618 Merge branch 'main' into yoon 2025-02-03 14:44:49 +09:00
yoon
7929d5a199 서비스 이름 변경 2025-02-03 14:44:11 +09:00
yoon
d3dde19c6a 주석 변경 2025-02-03 14:43:54 +09:00