tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

충돌 해결

Browse Source
This commit is contained in:
hylee 2023-12-06 18:54:00 +09:00
parent beeaf74f2d
commit ce95503cd7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
View File

@ -6840,7 +6840,6 @@ VALUES
</select> </select>
<<<<<<< HEAD
<select id="VEEduMIXDAO.selectExprnEndPagingList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO"> <select id="VEEduMIXDAO.selectExprnEndPagingList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
/* 임시.*NOT_SQL_LOG.* VEEduMIXDAO.selectPagingList */ /* 임시.*NOT_SQL_LOG.* VEEduMIXDAO.selectPagingList */
SELECT SELECT
@ -7638,7 +7637,8 @@ VALUES
*/ */
OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY; OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
</isNotEqual> </isNotEqual>
======= </select>
<select id="VEEduMIXDAO.selectEduCmpltCrtfcNmbrList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO"> <select id="VEEduMIXDAO.selectEduCmpltCrtfcNmbrList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
/* VEEduMIXDAO.selectEduCmpltCrtfcNmbrList */ /* VEEduMIXDAO.selectEduCmpltCrtfcNmbrList */
SELECT SELECT
@ -7653,6 +7653,5 @@ VALUES
AND vad.EDU_CMPLT_CRTFC_NMBR IS NOT null AND vad.EDU_CMPLT_CRTFC_NMBR IS NOT null
AND vad.EDU_CMPLT_CRTFC_NMBR LIKE TO_CHAR(SYSDATE, 'YYYY') || '%'; /* 현재연도로 시작하는지 확인 */ AND vad.EDU_CMPLT_CRTFC_NMBR LIKE TO_CHAR(SYSDATE, 'YYYY') || '%'; /* 현재연도로 시작하는지 확인 */
>>>>>>> refs/heads/hylee
</select> </select>
</sqlMap> </sqlMap>