765 Commits

Author SHA1 Message Date
25d97142b5 Merge pull request 'prd [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA)' (#147) from dev into prd-deploy
Reviewed-on: #147
2025-06-27 10:55:47 +09:00
b285e398af Merge pull request '[1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA)' (#145) from feature/cha into dev
Reviewed-on: #145
2025-06-27 10:54:25 +09:00
cha
4bf86e1040 [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA) 2025-06-27 10:51:08 +09:00
823f2cedba Merge pull request 'dev' (#144) from dev into prd-deploy
Reviewed-on: #144
2025-06-26 09:28:19 +09:00
b842e0ce4a Merge pull request '[1122]DESINGの見積excel様式の追加 - 견적서 추가' (#142) from feature/cha into dev
Reviewed-on: #142
2025-06-26 09:27:09 +09:00
cha
c14080bd05 [1122]DESINGの見積excel様式の追加 - 견적서 추가 2025-06-26 09:26:30 +09:00
a12a753ec5 Merge pull request '[1122]DESINGの見積excel様式の追加 - 견적서 추가' (#141) from feature/cha into dev
Reviewed-on: #141
2025-06-25 17:33:44 +09:00
cha
473adf36e4 [1122]DESINGの見積excel様式の追加 - 견적서 추가 2025-06-25 17:31:58 +09:00
afa0ac8225 Merge pull request 'dev' (#140) from dev into prd-deploy
Reviewed-on: #140
2025-06-25 13:16:48 +09:00
815c9363f1 Merge pull request '[1128]文字修正 - excel, pdf' (#138) from feature/cha into dev
Reviewed-on: #138
2025-06-25 13:15:36 +09:00
cha
1ad6b672b2 [1128]文字修正 - excel, pdf 2025-06-25 11:36:18 +09:00
50ff1bb833 Merge pull request 'prd [1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정2' (#137) from dev into prd-deploy
Reviewed-on: #137
2025-06-24 17:02:18 +09:00
55d7f23c44 Merge pull request '[1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정2' (#135) from feature/cha into dev
Reviewed-on: #135
2025-06-24 17:01:11 +09:00
cha
24cb0766a9 [1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정 2025-06-24 17:00:35 +09:00
43abb273e6 Merge pull request 'prd [1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정' (#134) from dev into prd-deploy
Reviewed-on: #134
2025-06-24 16:22:34 +09:00
fae960598c Merge pull request '[1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정' (#132) from feature/cha into dev
Reviewed-on: #132
2025-06-24 16:21:15 +09:00
cha
7db5ff1760 [1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정 2025-06-24 16:20:22 +09:00
b975bbac0d Merge pull request 'dev' (#131) from dev into prd-deploy
Reviewed-on: #131
2025-06-20 16:35:41 +09:00
c7f8d9be7b Merge pull request '운영배치 다 막음 (commonCode 빼고)' (#129) from feature/cha into dev
Reviewed-on: #129
2025-06-20 16:34:36 +09:00
cha
be8b1a02dd 운영배치 다 막음 (commonCode 빼고) 2025-06-20 16:33:59 +09:00
c8adf04e0a Merge pull request 'dev' (#128) from dev into prd-deploy
Reviewed-on: #128
2025-06-20 16:17:45 +09:00
bb12367085 Merge pull request '배치 setItemSyncSave 쿼리변경' (#126) from feature/cha into dev
Reviewed-on: #126
2025-06-20 16:16:48 +09:00
cha
9f3d680923 배치 setItemSyncSave 쿼리변경 2025-06-20 16:15:18 +09:00
4e30642fd8 Merge pull request 'dev 운영 배치 logback 에러설정' (#125) from dev into prd-deploy
Reviewed-on: #125
2025-06-20 16:05:04 +09:00
46dd54463a Merge pull request '운영 배치 logback 에러설정' (#123) from feature/cha into dev
Reviewed-on: #123
2025-06-20 16:04:03 +09:00
cha
bfb5cff8d2 운영 배치 logback 에러설정 2025-06-20 16:03:09 +09:00
ef2c1408fd Merge pull request '운영 배치 일부만 실행 (bomJob, materialJob, commonCodeJob)' (#122) from dev into prd-deploy
Reviewed-on: #122
2025-06-20 09:27:06 +09:00
fe454901e6 Merge pull request '운영 배치 일부만 실행 (bomJob, materialJob, commonCodeJob)' (#120) from feature/cha into dev
Reviewed-on: #120
2025-06-20 09:25:26 +09:00
cha
05740d5960 운영 배치 일부만 실행 (bomJob, materialJob, commonCodeJob) 2025-06-20 09:23:00 +09:00
48551018e8 Merge pull request 'dev' (#119) from dev into prd-deploy
Reviewed-on: #119
2025-06-19 17:08:30 +09:00
720d8859ba Merge pull request '템플릿 크기 변경' (#117) from feature/cha into dev
Reviewed-on: #117
2025-06-19 17:07:47 +09:00
cha
e277006a2f 템플릿 크기 변경 2025-06-19 17:07:10 +09:00
3788d269b8 Merge pull request 'dev' (#116) from dev into prd-deploy
Reviewed-on: #116
2025-06-19 17:05:29 +09:00
c9024cc885 Merge pull request '템플릿 크기 변경' (#114) from feature/cha into dev
Reviewed-on: #114
2025-06-19 17:04:46 +09:00
cha
a11d515a05 템플릿 크기 변경 2025-06-19 17:04:11 +09:00
18e38074ec Merge pull request 'dev' (#113) from dev into prd-deploy
Reviewed-on: #113
2025-06-19 16:57:27 +09:00
3b581f608c Merge pull request '템플릿 수정 (이미지 사이즈 변경)' (#111) from feature/cha into dev
Reviewed-on: #111
2025-06-19 16:56:11 +09:00
cha
98c78de67b 템플릿 수정 (이미지 사이즈 변경) 2025-06-19 16:54:42 +09:00
e114ec5c51 Merge pull request 'dev' (#110) from dev into prd-deploy
Reviewed-on: #110
2025-06-19 10:04:03 +09:00
4675dd4a56 Merge pull request '배치 스케쥴 수정 (yml)' (#108) from feature/cha into dev
Reviewed-on: #108
2025-06-19 09:58:39 +09:00
cha
3204491cd0 배치 스케쥴 수정 (yml) 2025-06-19 09:57:39 +09:00
8e2f98ff07 moduleTypeItemList storeId 추가 2025-06-19 09:47:10 +09:00
b4b4e83939 storeId 파라미터 추가 2025-06-19 09:42:09 +09:00
4c6f092e46 Merge pull request 'dev' (#107) from dev into prd-deploy
Reviewed-on: #107
2025-06-18 18:25:02 +09:00
49de2f2a55 Merge pull request '스프링 배치 (운영) - 3개 다 막음' (#105) from feature/cha into dev
Reviewed-on: #105
2025-06-18 18:24:15 +09:00
cha
f36b01917c 스프링 배치 (운영) - 3개 다 막음 2025-06-18 18:23:35 +09:00
1497d6ce11 Merge pull request 'dev' (#104) from dev into prd-deploy
Reviewed-on: #104
2025-06-18 18:21:02 +09:00
cf99ed3ccd Merge pull request '스프링 배치 (운영) - PRICE 막음' (#102) from feature/cha into dev
Reviewed-on: #102
2025-06-18 18:19:30 +09:00
cha
8ba1a2c183 스프링 배치 (운영) - PRICE 막음 2025-06-18 18:15:45 +09:00
ecbd5aea91 Merge pull request 'dev' (#101) from dev into prd-deploy
Reviewed-on: #101
2025-06-18 14:08:06 +09:00