Commit Graph

105 Commits

Author SHA1 Message Date
6d46c07b29 Merge branch 'main' of
http://192.168.0.251:3000/localnet/localhost-back.git into main
2025-02-27 14:39:50 +09:00
741fc0260e Merge branch 'khj' into main 2025-02-27 13:28:53 +09:00
f119c4724a 투표수정 2025-02-27 13:28:32 +09:00
yoon
d6f205f332 Merge branch 'main' into yoon 2025-02-27 13:27:20 +09:00
yoon
ebab4bb51e 삭제 추가 2025-02-27 13:24:06 +09:00
c94c6bd8e3 Merge branch 'vacation' into main 2025-02-27 13:20:58 +09:00
5835b39da7 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-back.git into main 2025-02-27 13:16:42 +09:00
1345a5ce0b Merge remote-tracking branch 'origin/jihee' into main 2025-02-27 13:16:25 +09:00
11f1503d1e 휴가수정 2025-02-27 13:07:25 +09:00
17552d0867 용어집 수정 BlobUtil 추ㅏㄱ 2025-02-25 13:20:13 +09:00
231b763f7c blob 공통으로 분리 2025-02-25 10:50:29 +09:00
yoon
41372391de 주석 변경 2025-02-25 09:50:58 +09:00
yoon
a7e3dfd23d Merge branch 'main' into yoon 2025-02-25 09:47:48 +09:00
yoon
2c5705088b . 2025-02-25 09:47:06 +09:00
3192db220d 게시판 수정 2025-02-24 16:10:05 +09:00
fec0172d66 게시판 댓글 수정 2025-02-24 15:04:53 +09:00
1563af1d6b Merge branch 'khj' into main 2025-02-24 13:35:28 +09:00
972c18d1cb 수정 2025-02-24 13:34:59 +09:00
yoon
2f83264ce0 전화번호 중복체크, 회원가입 시 프로젝트 멤버 테이블에 자동 insert (미참여 형태로) 2025-02-24 12:01:50 +09:00
c721da3d6f . 2025-02-24 11:07:24 +09:00
yoon
7e8090dead 비밀번호 중복체크 2025-02-22 18:08:43 +09:00
873910358c 휴가 수정 2025-02-21 16:21:03 +09:00
8e64369b77 게시판 글작성 수정 2025-02-21 11:00:03 +09:00
yoon
77af3859f2 Merge branch 'main' into yoon 2025-02-21 09:18:50 +09:00
yoon
b538979ed6 프로젝트 목록 검색 + 카테고리 2025-02-21 09:18:20 +09:00
51c2eb8f01 대댓글 mapper 매핑 수정(기존:boardMapper.selectCommets ->
boardMapper.selectREply)
2025-02-21 09:04:27 +09:00
e2ef67a3d9 휴가 수정 2025-02-20 16:19:52 +09:00
b6097165ca Merge branch 'khj' into main 2025-02-20 11:17:47 +09:00
68b8a26322 수정 2025-02-20 11:16:48 +09:00
b4c49fbe58 댓글 좋아요/싫어요 수정 2025-02-20 10:36:05 +09:00
b09f4cda2f 2025-02-18 16:05:00 +09:00
yoon
b8bee16816 Merge branch 'main' into yoon 2025-02-18 13:04:38 +09:00
c27687438c 에디터 수정, 게시판 메소드명 수정 2025-02-18 12:59:04 +09:00
yoon
8b39912927 프로젝트 목록 2025-02-18 11:14:52 +09:00
yoon
59d193733c get -> select 2025-02-17 15:02:59 +09:00
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
1563e9409a 휴가관리 기능 추가 2025-02-14 16:23:33 +09:00
9612b091ba 게시판,휴가 수정 2025-02-14 14:06:05 +09:00
ea3ce3b517 휴가관리 사원 연차사용정보 추가 2025-02-13 16:24:38 +09:00
yoon
7c3f646b36 updateColorYon map으로 변경 2025-02-13 15:19:04 +09:00
yoon
0779f6a2c8 프로젝트 년도 불러오기 2025-02-11 09:55:19 +09:00
331b5d53f5 s 2025-02-10 15:13:37 +09:00
d8c653618c memberseq 임의값으로 수정(임시) 2025-02-10 14:28:44 +09:00
87a9240a97 휴가관리,보드컨트롤러 수정 2025-02-07 16:20:03 +09:00
yoon
8fa323414a map으로 변경 2025-02-07 14:49:08 +09:00