|
|
3392d342b0
|
Merge pull request 'businessTeamCd -> businessChargerTeamCd' (#293) from dev into dev-deploy
Reviewed-on: #293
|
2026-01-05 14:52:46 +09:00 |
|
|
|
6944ff4b00
|
businessTeamCd -> businessChargerTeamCd
|
2026-01-05 14:51:49 +09:00 |
|
|
|
acec646754
|
Merge pull request 'QCAST_CUST_PRD_ID != PC_ITEM_ID 수정' (#291) from dev into dev-deploy
Reviewed-on: #291
|
2026-01-05 14:02:46 +09:00 |
|
|
|
d0908de86f
|
QCAST_CUST_PRD_ID != PC_ITEM_ID 수정
|
2026-01-05 14:01:34 +09:00 |
|
|
|
aeefbdd7cc
|
Merge pull request 'dev' (#289) from dev into dev-deploy
Reviewed-on: #289
|
2026-01-05 13:07:48 +09:00 |
|
|
|
5685caad47
|
QCAST_CUST_PRD_ID != PC_ITEM_ID
|
2026-01-05 13:06:50 +09:00 |
|
|
|
1a2963cd91
|
Merge remote-tracking branch 'origin/dev' into feature/ysCha
# Conflicts:
# src/main/resources/mappers/estimate/estimateMapper.xml
|
2026-01-05 11:30:47 +09:00 |
|
|
|
c0a7c24bbb
|
QCAST_CUST_PRD_ID != PC_ITEM_ID
|
2026-01-05 11:30:15 +09:00 |
|
|
|
0b13ab7c58
|
Merge pull request 'estimateMapper.xml' (#287) from dev into dev-deploy
Reviewed-on: #287
|
2026-01-02 15:44:26 +09:00 |
|
|
|
ac00a93719
|
estimateMapper.xml
|
2026-01-02 15:43:15 +09:00 |
|
|
|
109430e1d2
|
Merge pull request 'estimateMapper.xml' (#286) from dev into dev-deploy
Reviewed-on: #286
|
2026-01-02 14:23:04 +09:00 |
|
|
|
493f006d74
|
estimateMapper.xml
|
2026-01-02 14:21:22 +09:00 |
|
|
|
8152e029ce
|
Merge pull request '배치가 멈춰있더라도 1시간만 지나면 별도의 조치 없이 다음 실행 때 자동으로 정상화' (#285) from dev into dev-deploy
Reviewed-on: #285
|
2025-12-31 14:56:17 +09:00 |
|
|
|
efb29f8eb6
|
배치가 멈춰있더라도 1시간만 지나면 별도의 조치 없이 다음 실행 때 자동으로 정상화
|
2025-12-31 14:55:49 +09:00 |
|
|
|
de9219cf56
|
Merge pull request 'resetFailedJobs가 실행되면서 DB에 끼어있던(STARTED) 상태들을 모두 실패(FAILED)로 바꿈' (#284) from dev into dev-deploy
Reviewed-on: #284
|
2025-12-31 14:23:32 +09:00 |
|
|
|
7de3098785
|
resetFailedJobs가 실행되면서 DB에 끼어있던(STARTED) 상태들을 모두 실패(FAILED)로 바꿈
|
2025-12-31 14:22:58 +09:00 |
|
|
|
fefde969db
|
Merge pull request '"storeAdditionalJob","businessChargerJob","adminUserJob" 허용' (#283) from dev into dev-deploy
Reviewed-on: #283
|
2025-12-31 09:46:25 +09:00 |
|
|
|
063f2bd382
|
"storeAdditionalJob","businessChargerJob","adminUserJob" 허용
|
2025-12-31 09:45:05 +09:00 |
|
|
|
fcd47662cb
|
Merge pull request 'dev' (#281) from dev into dev-deploy
Reviewed-on: #281
|
2025-12-30 14:30:48 +09:00 |
|
|
|
10f95281a3
|
Merge remote-tracking branch 'origin/dev' into feature/ysCha
|
2025-12-30 14:27:33 +09:00 |
|
|
|
47e02689f7
|
pcsMakerList 에 storeId 추가
|
2025-12-30 14:26:50 +09:00 |
|
|
|
dca4a83062
|
Merge pull request 'String으로 수정' (#279) from dev into dev-deploy
Reviewed-on: #279
|
2025-12-24 17:50:09 +09:00 |
|
|
|
2e1e027beb
|
String으로 수정
|
2025-12-24 17:49:16 +09:00 |
|
|
|
9c5feef68d
|
Merge pull request 'northModuleYn 컬럼 추가' (#277) from dev into dev-deploy
Reviewed-on: #277
|
2025-12-24 17:31:29 +09:00 |
|
|
|
c8cf6aec24
|
northModuleYn 컬럼 추가
|
2025-12-24 17:28:40 +09:00 |
|
|
|
c4eb97a02a
|
Merge pull request '엑셀수정' (#276) from dev into dev-deploy
Reviewed-on: #276
|
2025-12-23 17:57:22 +09:00 |
|
|
|
bf9a9506fc
|
엑셀수정
|
2025-12-23 17:56:39 +09:00 |
|
|
|
cb18e2196a
|
Merge pull request '특이사항 제거 ,excel, pdf' (#274) from dev into dev-deploy
Reviewed-on: #274
|
2025-12-22 11:24:20 +09:00 |
|
|
|
3b4b4aaba8
|
특이사항 제거 ,excel, pdf
|
2025-12-22 11:23:25 +09:00 |
|
|
|
14125fc2cc
|
Merge pull request '엑셀사이즈변경' (#272) from dev into dev-deploy
Reviewed-on: #272
|
2025-12-19 13:10:08 +09:00 |
|
|
|
e232ba405d
|
엑셀사이즈변경
|
2025-12-19 13:09:34 +09:00 |
|
|
|
6f0d043603
|
Merge pull request '특이사항 제거 ,excel, pdf' (#270) from dev into dev-deploy
Reviewed-on: #270
|
2025-12-18 14:01:50 +09:00 |
|
|
|
3347d17a11
|
특이사항 제거 ,excel, pdf
|
2025-12-18 14:00:16 +09:00 |
|
|
|
cd91cc9006
|
Merge pull request '방위각 절대치 적용' (#268) from dev into dev-deploy
Reviewed-on: #268
|
2025-12-17 18:44:29 +09:00 |
|
|
|
c2a9a444a2
|
방위각 절대치 적용
|
2025-12-17 18:42:32 +09:00 |
|
|
|
901ba11c59
|
Merge pull request 'custNm 추가' (#266) from dev into dev-deploy
Reviewed-on: #266
|
2025-12-16 10:58:08 +09:00 |
|
|
|
3ba39dcfc3
|
custNm 추가
|
2025-12-16 10:56:23 +09:00 |
|
|
|
92c96eec96
|
Merge pull request '[1314] houi 절대값으로 변경' (#264) from dev into dev-deploy
Reviewed-on: #264
|
2025-12-15 16:43:01 +09:00 |
|
|
|
892e2acb45
|
[1314] houi 절대값으로 변경
|
2025-12-15 16:18:10 +09:00 |
|
|
|
0f0da4f9be
|
Merge pull request '경사도 기본 수치 추가 inclBase' (#263) from dev into dev-deploy
Reviewed-on: #263
|
2025-12-15 15:18:15 +09:00 |
|
|
|
eb621b5cc5
|
경사도 기본 수치 추가 inclBase
|
2025-12-15 15:10:33 +09:00 |
|
|
|
65c7a1bae4
|
Merge pull request 'pdf 디자인변경 및 크기변경' (#261) from dev into dev-deploy
Reviewed-on: #261
|
2025-12-15 13:11:54 +09:00 |
|
|
|
72cba944dc
|
pdf 디자인변경 및 크기변경
|
2025-12-15 13:10:58 +09:00 |
|
|
|
4563be8c2c
|
Merge pull request 'pdf 디자인변경 및 크기변경' (#259) from dev into dev-deploy
Reviewed-on: #259
|
2025-12-11 15:33:44 +09:00 |
|
|
|
96726f5452
|
pdf 디자인변경 및 크기변경
|
2025-12-11 15:32:44 +09:00 |
|
|
|
a1b44cac5c
|
Merge pull request '혼함모듈 계산 수정' (#257) from dev into dev-deploy
Reviewed-on: #257
|
2025-12-10 11:24:45 +09:00 |
|
|
|
64d9cdf837
|
혼함모듈 계산 수정
|
2025-12-10 11:23:58 +09:00 |
|
|
|
f612c8dba6
|
Merge pull request 'dev' (#256) from dev into dev-deploy
Reviewed-on: #256
|
2025-12-10 09:36:24 +09:00 |
|
|
|
73e22af72b
|
혼함모듈 수정
|
2025-12-10 09:35:40 +09:00 |
|
|
|
e4fb11bb03
|
t_simulation_area del_flg 추가
|
2025-12-10 09:34:34 +09:00 |
|
