788 Commits

Author SHA1 Message Date
97874c34e6 Merge pull request 'dev' (#159) from dev into dev-deploy
Reviewed-on: #159
2025-07-04 14:13:52 +09:00
cha
0636711957 Merge remote-tracking branch 'origin/dev' into feature/ysCha 2025-07-04 14:12:40 +09:00
cha
6100a68bfa [1167] 출력 Excel의 주의사항이 모두 표시되지 않습니다 2025-07-04 14:11:53 +09:00
c43a7e1f94 Merge pull request 'dev' (#157) from dev into dev-deploy
Reviewed-on: #157
2025-07-04 13:29:20 +09:00
23c0b6d24b Merge pull request '[1171] 출력 Excel 표시 물건명에 반영' (#156) from feature/ysCha into dev
Reviewed-on: #156
2025-07-04 13:28:56 +09:00
cha
48cc20fbbc [1171] 출력 Excel 표시 물건명에 반영 2025-07-04 13:27:18 +09:00
1679859acb Merge pull request 'dev' (#154) from dev into dev-deploy
Reviewed-on: #154
2025-07-04 13:22:58 +09:00
cha
984cef2695 Merge remote-tracking branch 'origin/dev' into feature/ysCha 2025-07-04 13:21:07 +09:00
cha
56f19e5faa [1171] 출력 Excel 표시 물건명에 반영 2025-07-04 13:13:36 +09:00
8c4b1cb930 Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다.' (#152) from dev into dev-deploy
Reviewed-on: #152
2025-07-03 16:14:55 +09:00
d41afb6545 Merge pull request '[1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다.' (#151) from feature/cha into dev
Reviewed-on: #151
2025-07-03 16:14:08 +09:00
cha
bce18006c8 [1155] Excel에 출력되는 설비 용량(인정 용량)이 다릅니다. 2025-07-03 16:11:37 +09:00
d22eaac274 Merge pull request 'dev' (#149) from dev into dev-deploy
Reviewed-on: #149
2025-06-27 18:48:26 +09:00
f035763209 Merge pull request '[1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE => T_SIMULATION_PREFECTURE)' (#148) from feature/cha into dev
Reviewed-on: #148
2025-06-27 18:48:04 +09:00
cha
363753745c [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE => T_SIMULATION_PREFECTURE) 2025-06-27 18:40:51 +09:00
94fb14e732 Merge pull request 'dev [1131] 발전 시뮬레이션 선택 지역 수정 発電シミュレーションの選択地域の修正 (M_PREFECTURE_AREA => T_SIMULATION_AREA)' (#146) from dev into dev-deploy
Reviewed-on: #146
2025-06-27 10:55:17 +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
b4142e112d Merge pull request 'dev' (#143) from dev into dev-deploy
Reviewed-on: #143
2025-06-26 09:27:51 +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
7dbc8b367d Merge pull request 'dev [1128]文字修正 - excel, pdf' (#139) from dev into dev-deploy
Reviewed-on: #139
2025-06-25 13:16:01 +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
ede94ab769 Merge pull request 'dev [1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정2' (#136) from dev into dev-deploy
Reviewed-on: #136
2025-06-24 17:01:50 +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
41d448249e Merge pull request 'dev [1126]Excelの架台図/割付図・系統図 で屋根の情報が表示されなくなった 엑셀출력 수정' (#133) from dev into dev-deploy
Reviewed-on: #133
2025-06-24 16:22:10 +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
08914f1516 Merge pull request 'dev 운영배치 다 막음 (commonCode 빼고)' (#130) from dev into dev-deploy
Reviewed-on: #130
2025-06-20 16:35:13 +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
63cf9a8ee8 Merge pull request 'dev 배치 setItemSyncSave 쿼리변경' (#127) from dev into dev-deploy
Reviewed-on: #127
2025-06-20 16:19:11 +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
bd6ecfde80 Merge pull request 'dev 운영 배치 logback 에러설정' (#124) from dev into dev-deploy
Reviewed-on: #124
2025-06-20 16:04:40 +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
7b81e5b6a2 Merge pull request '운영 배치 일부만 실행 (bomJob, materialJob, commonCodeJob)' (#121) from dev into dev-deploy
Reviewed-on: #121
2025-06-20 09:26:35 +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
249cf65fc6 Merge pull request 'dev' (#118) from dev into dev-deploy
Reviewed-on: #118
2025-06-19 17:08:12 +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
6cffd578b5 Merge pull request 'dev' (#115) from dev into dev-deploy
Reviewed-on: #115
2025-06-19 17:05:12 +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