1031 Commits

Author SHA1 Message Date
bb6a2968cf Merge pull request '[1429] TT.DISP_ORDER, TT.ITEM_ID' (#353) from dev into dev-deploy
Reviewed-on: #353
2026-01-27 17:50:12 +09:00
a52842776d [1429] TT.DISP_ORDER, TT.ITEM_ID 2026-01-27 17:39:34 +09:00
0bedaa32f0 Merge pull request 'dev' (#352) from dev into dev-deploy
Reviewed-on: #352
2026-01-26 17:33:57 +09:00
3d134fe5be Merge pull request '판매점 가격 정보 개선' (#351) from feature/rjy-0113 into dev
Reviewed-on: #351
2026-01-26 17:33:30 +09:00
132cfa6d0a 판매점 가격 정보 개선 2026-01-26 17:32:57 +09:00
d11578d472 Merge pull request 'dev' (#350) from dev into dev-deploy
Reviewed-on: #350
2026-01-26 16:28:18 +09:00
0204e95b67 Merge pull request '판매점 가격 패턴 수정' (#349) from feature/rjy-0113 into dev
Reviewed-on: #349
2026-01-26 16:27:17 +09:00
04d0b618a3 판매점 가격 패턴 수정 2026-01-26 16:26:46 +09:00
f9bbe04a9c Merge pull request 'dev' (#348) from dev into dev-deploy
Reviewed-on: #348
2026-01-26 15:16:17 +09:00
9f89a6c75e Merge pull request '판매점 저장 API에도 가격 패턴 추가' (#347) from feature/rjy-0113 into dev
Reviewed-on: #347
2026-01-26 15:15:30 +09:00
55a231304e 판매점 저장 API에도 가격 패턴 추가 2026-01-26 15:15:04 +09:00
ead7dc32ab Merge pull request 'dev' (#346) from dev into dev-deploy
Reviewed-on: #346
2026-01-26 14:18:14 +09:00
913a4df685 Merge pull request '판매점 동기화시 가격 패턴 추가(1차판매점 : bos랭크, 2차판매점:정가)' (#345) from feature/rjy-0113 into dev
Reviewed-on: #345
2026-01-26 14:17:13 +09:00
fe1b0da695 판매점 동기화시 가격 패턴 추가(1차판매점 : bos랭크, 2차판매점:정가) 2026-01-26 14:13:05 +09:00
35cae5901c Merge pull request 'dev' (#344) from dev into dev-deploy
Reviewed-on: #344
2026-01-23 15:17:55 +09:00
33d92eb56d Merge pull request '신규 판매점 등록시 2차이상인경우 정가 가격 등록' (#343) from feature/rjy-0113 into dev
Reviewed-on: #343
2026-01-23 15:15:59 +09:00
141e46f150 신규 판매점 등록시 2차이상인경우 정가 가격 등록 2026-01-23 15:15:18 +09:00
f76fcdd488 Merge pull request '[1417] 폰트통일' (#341) from dev into dev-deploy
Reviewed-on: #341
2026-01-23 09:35:04 +09:00
6c9286626e [1417] 폰트통일 2026-01-23 09:34:15 +09:00
d75a870f86 Merge pull request '[1375]인증용량 계산수정' (#339) from dev into dev-deploy
Reviewed-on: #339
2026-01-22 15:34:53 +09:00
2c51f508f6 [1375]인증용량 계산수정 2026-01-22 14:45:51 +09:00
6315c9cfc0 Merge pull request 'dev' (#337) from dev into dev-deploy
Reviewed-on: #337
2026-01-22 13:42:58 +09:00
4db0654e73 pdf null 오류 2026-01-22 13:42:10 +09:00
65a0fd430e [1375]인증용량 계산수정 2026-01-22 13:41:41 +09:00
a9adaf4d23 [1414]출력에서 기울기(촌) 소수점 2자리 2026-01-22 13:41:14 +09:00
9098ce8c84 Merge pull request '[1375]인증용량 계산수정' (#335) from dev into dev-deploy
Reviewed-on: #335
2026-01-21 11:31:29 +09:00
51624587fa [1375]인증용량 계산수정 2026-01-21 11:30:56 +09:00
143eb44612 Merge pull request '[1375]인증용량 계산수정' (#334) from dev into dev-deploy
Reviewed-on: #334
2026-01-21 11:21:47 +09:00
0e42065940 [1375]인증용량 계산수정 2026-01-21 11:21:14 +09:00
547330163b Merge pull request '[1375]인증용량 계산수정' (#333) from dev into dev-deploy
Reviewed-on: #333
2026-01-21 11:14:55 +09:00
daff44d1b2 [1375]인증용량 계산수정 2026-01-21 11:13:07 +09:00
2050c0027a Merge pull request 'dev' (#331) from dev into dev-deploy
Reviewed-on: #331
2026-01-20 13:52:45 +09:00
7ad357e623 Merge remote-tracking branch 'origin/dev' into feature/ysCha 2026-01-20 13:51:29 +09:00
cb59653c6c [1375]인증용량 2026-01-20 13:49:32 +09:00
419c6af7ce Merge pull request '[1394]시뮬레이션 목록 오류' (#329) from dev into dev-deploy
Reviewed-on: #329
2026-01-19 11:10:38 +09:00
e3f4bc3fb3 Merge pull request '[1394]시뮬레이션 목록 오류' (#328) from dev_cha into dev
Reviewed-on: #328
2026-01-19 11:10:00 +09:00
3156052526 [1394]시뮬레이션 목록 오류 2026-01-19 11:08:57 +09:00
3974ea39fe Merge pull request 'dev' (#326) from dev into dev-deploy
Reviewed-on: #326
2026-01-14 16:13:43 +09:00
8ef500eb7d Merge pull request '[이정표] 견적서 PDF 2차점 가격 숨김 처리' (#325) from feature/dev-jp-001 into dev
Reviewed-on: #325
2026-01-14 16:10:20 +09:00
6d711bfc5c [이정표] 견적서 PDF 2차점 가격 숨김 처리 2026-01-14 16:09:33 +09:00
b9626f4ae3 Merge pull request 'dev' (#324) from dev into dev-deploy
Reviewed-on: #324
2026-01-14 14:37:17 +09:00
ffe341153b Merge pull request '[이정표] 견적서 PDF 2차점 가격 숨김 처리' (#323) from feature/dev-jp-001 into dev
Reviewed-on: #323
2026-01-14 14:27:14 +09:00
e90cbc5d70 [이정표] 견적서 PDF 2차점 가격 숨김 처리 2026-01-14 14:26:39 +09:00
fd968a997e Merge pull request '[이정표] 견적서 PDF 2차점 가격 숨김 처리' (#322) from feature/dev-jp-001 into dev
Reviewed-on: #322
2026-01-14 14:23:35 +09:00
171f37de8c [이정표] 견적서 PDF 2차점 가격 숨김 처리 2026-01-14 14:21:56 +09:00
78861015db Merge pull request 'dev' (#321) from dev into dev-deploy
Reviewed-on: #321
2026-01-14 14:13:43 +09:00
586fcb7ae0 Merge pull request '[이정표] 견적서 PDF 2차점 가격 숨김 처리' (#320) from feature/dev-jp-001 into dev
Reviewed-on: #320
2026-01-14 14:03:09 +09:00
293a1a3a82 [이정표] 견적서 PDF 2차점 가격 숨김 처리 2026-01-14 14:02:13 +09:00
4ec934438b Merge pull request 'dev' (#318) from dev into dev-deploy
Reviewed-on: #318
2026-01-14 13:14:10 +09:00
efed783c6a Merge pull request '[이정표] 견적서 2차점 가격 보이도록 처리 (2차가 작성한 경우)' (#317) from feature/dev-jp-001 into dev
Reviewed-on: #317
2026-01-14 13:13:10 +09:00