642 Commits

Author SHA1 Message Date
de3b9399a7 Merge pull request '운영 반영' (#56) from feature/cha into dev
Reviewed-on: #56
2025-06-04 09:52:56 +09:00
cha
83dc616461 운영 반영 2025-06-04 09:51:56 +09:00
0d9ed9156f Merge pull request '운영 반영' (#54) from feature/cha into dev
Reviewed-on: #54
2025-06-04 09:33:56 +09:00
cha
2586a8b9e5 운영 반영 2025-06-04 09:33:01 +09:00
3ab3c1143a Merge pull request '운영 반영' (#52) from feature/cha into dev
Reviewed-on: #52
2025-06-04 09:15:58 +09:00
cha
c65407bf6f 운영 반영 2025-06-04 09:14:57 +09:00
9452ea28b0 Merge pull request 'job 멈춤' (#50) from feature/cha into dev
Reviewed-on: #50
2025-06-04 09:11:53 +09:00
cha
f9fd37065f job 멈춤 2025-06-04 09:10:15 +09:00
5ddc032d99 Merge pull request '마이너스 서식변경' (#48) from cha into dev
Reviewed-on: #48
2025-06-02 19:00:55 +09:00
00f30d2128 마이너스 서식변경 2025-06-02 18:53:56 +09:00
4b9758846f Merge pull request '복사 할때 T_CANVAS_POPUP_STATUS 내용도 복사' (#46) from feature/cha into dev
Reviewed-on: #46
2025-06-02 17:50:10 +09:00
cha
50693caac6 복사 할때 T_CANVAS_POPUP_STATUS 내용도 복사 2025-06-02 17:48:53 +09:00
85fc0a5357 Merge pull request 'feature/cha' (#44) from feature/cha into dev
Reviewed-on: #44
2025-06-02 11:14:53 +09:00
cha
4f4b3b7ba0 운영디비 변경 2025-06-02 11:13:24 +09:00
476e44d801 Merge pull request 'dev' (#43) from dev into dev-deploy
Reviewed-on: #43
2025-05-30 17:39:11 +09:00
d666a62dad Merge pull request 'batch.job.enable 추가 : 운영에서 7월까지 배치(공통코드 제외)가 실행되면 안됨' (#42) from feature/cha into dev
Reviewed-on: #42
2025-05-30 17:38:41 +09:00
cha
25c10e5f16 batch.job.enable 추가 : 운영에서 7월까지 배치(공통코드 제외)가 실행되면 안됨 2025-05-30 17:36:55 +09:00
ccdbb16ad6 Merge pull request 'dev' (#41) from dev into dev-deploy
Reviewed-on: #41
2025-05-30 17:10:44 +09:00
fd35964144 Merge pull request '[1068] 견적서 삭제 api 수정' (#40) from feature/cha into dev
Reviewed-on: #40
2025-05-30 17:10:23 +09:00
cha
ee2a8a357d [1068] 견적서 삭제 api 수정 2025-05-30 17:06:02 +09:00
1734a9ac43 Merge pull request 'dev' (#39) from dev into dev-deploy
Reviewed-on: #39
2025-05-30 15:46:19 +09:00
fb78708764 Merge pull request '[1068] 견적서 삭제 api 추가' (#38) from feature/cha into dev
Reviewed-on: #38
2025-05-30 15:45:44 +09:00
cha
e7f725c0a1 [1068] 견적서 삭제 api 추가 2025-05-30 15:35:16 +09:00
a93c52bc8b Merge pull request 'dev' (#37) from dev into dev-deploy
Reviewed-on: #37
2025-05-30 10:25:04 +09:00
dc7dc79d66 Merge pull request 's3이미지 경로변경' (#36) from feature/cha into dev
Reviewed-on: #36
2025-05-30 10:24:30 +09:00
cha
de7597823c s3이미지 경로변경 2025-05-30 10:23:17 +09:00
4fe50e1ad5 Merge pull request 'dev' (#35) from dev into dev-deploy
Reviewed-on: #35
2025-05-30 09:49:36 +09:00
cf975cc650 Merge pull request '엑셀다운로드 debug' (#34) from feature/cha into dev
Reviewed-on: #34
2025-05-30 09:49:06 +09:00
cha
061c1d49d8 엑셀다운로드 debug 2025-05-30 09:47:51 +09:00
a5f174e5da Merge pull request 'dev' (#33) from dev into dev-deploy
Reviewed-on: #33
2025-05-29 16:11:39 +09:00
bf979e9d82 Merge pull request 'qna downloadFile2 변경' (#32) from feature/cha into dev
Reviewed-on: #32
2025-05-29 16:10:30 +09:00
cha
9f71c354a8 qna downloadFile2 변경 2025-05-29 16:09:11 +09:00
75b40b7c0b 개발계 DB 테스트 원복 2025-05-28 14:28:28 +09:00
589110be50 개발계 DB 테스트 원복 2025-05-28 14:27:34 +09:00
bdf8b7bcca encrypt 삭제 2025-05-28 14:04:55 +09:00
3fa0957f80 encrypt 삭제 2025-05-28 14:04:39 +09:00
6a3e49985b QCAST2 개발 DB 테스트 반영 2025-05-28 13:57:34 +09:00
fe8de9e75c QCAST2 개발 DB 테스트 반영 2025-05-28 13:57:14 +09:00
650d864ef6 Merge pull request 'dev' (#31) from dev into dev-deploy
Reviewed-on: #31
2025-05-28 13:11:37 +09:00
753bab0c48 Merge pull request 'qna downloadFile2 추가' (#30) from feature/cha into dev
Reviewed-on: #30
2025-05-28 13:11:02 +09:00
cha
c04ccb43bb qna downloadFile2 추가 2025-05-28 13:09:29 +09:00
7427c8fe34 Merge pull request 'dev' (#29) from dev into dev-deploy
Reviewed-on: #29
2025-05-26 17:01:12 +09:00
7508921a0d 개발계로 변경
# Conflicts:
#	src/main/resources/config/application-dev.yml
2025-05-26 15:49:41 +09:00
3a1a85caae Merge branch 'dev' into feature/dev-yj 2025-05-26 15:48:19 +09:00
1de1a09f5d 개발계로 변경 2025-05-26 15:47:42 +09:00
af01ba2579 Merge pull request 'mssql formate => cast' (#28) from feature/cha into dev
Reviewed-on: #28
2025-05-26 15:39:34 +09:00
cha
703256cbf8 mssql formate => cast 2025-05-26 15:37:33 +09:00
cha
63fc66a7a4 이미지 로그 삭제 2025-05-23 14:53:52 +09:00
25f2495e57 Merge pull request '이미지 로그 삭제' (#27) from feature/cha into dev
Reviewed-on: #27
2025-05-23 14:53:15 +09:00
cha
79b884c563 이미지 로그 삭제 2025-05-23 14:48:30 +09:00