From 118b478ddef8096ee14fcf5194922f80ea6a1ade Mon Sep 17 00:00:00 2001 From: JooYoung Date: Wed, 21 Sep 2022 15:53:15 +0900 Subject: [PATCH] merge complete --- .../kccadr/adjstExp/web/AdjstExpController.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index c3e70fe7..e5baab97 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -97,26 +97,11 @@ public class AdjstExpController { adjstReqVO.setStep(KccadrConstants.STEP6); - -<<<<<<< HEAD - // 오라클 연동 테스트 > 여현준 -// sMSOracleService.selectOracleTest(); -// AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO(); -// adjReqMgrVO.setAdrSeq("ADR_0000000000000381"); -// adjReqMgrVO.setStatCd("104010"); -// sMSOracleService.insertSmsSend(adjReqMgrVO); - - //로그인 권한정보 불러오기 -// LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; -// String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); - model.addAttribute("crtfcSn", "N"); -======= String crtfcSn = "N"; model.addAttribute("crtfcSn", crtfcSn); ->>>>>>> refs/heads/anjooyoung return "/web/kccadr/adjstExp/adjstReqRegistInformation"; }