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:
jiwoo 2023-12-18 17:57:43 +09:00
parent 78ff10194b
commit a6bfa60797
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
View File

@ -3459,7 +3459,6 @@
)bbb )bbb
on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd) on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd)
GROUP BY rollup(yr, bbb.prcs_nm) GROUP BY rollup(yr, bbb.prcs_nm)
<<<<<<< HEAD
</select> </select>
<select id="VEInstrMixDAO.findByIdFromVeInstr" parameterClass="VEInstrDetailVO" resultClass="VELctrDetailVO"> <select id="VEInstrMixDAO.findByIdFromVeInstr" parameterClass="VEInstrDetailVO" resultClass="VELctrDetailVO">
@ -3481,7 +3480,6 @@
USER_ID = #userId# USER_ID = #userId#
</select> </select>
=======
</select> </select>
<delete id="VEInstrMixDAO.deleteInstrEmailCrtfd" parameterClass="VEInstrDetailVO"> <delete id="VEInstrMixDAO.deleteInstrEmailCrtfd" parameterClass="VEInstrDetailVO">
@ -3540,5 +3538,4 @@
WHERE instr_detail_ord = #instrDetailOrd# WHERE instr_detail_ord = #instrDetailOrd#
AND instr_div = #instrDiv# AND instr_div = #instrDiv#
</update> </update>
>>>>>>> refs/heads/JIWOO
</sqlMap> </sqlMap>