This commit is contained in:
parent
126c3cc556
commit
a85375e94e
|
|
@ -2250,9 +2250,6 @@
|
||||||
<isNotNull property="year">and year(a.sstime)=#year#</isNotNull>
|
<isNotNull property="year">and year(a.sstime)=#year#</isNotNull>
|
||||||
order by a.sstime,a.setime
|
order by a.sstime,a.setime
|
||||||
</select>
|
</select>
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
<select id="cm.cminningscds.applyedu.my" parameterClass="hashtable" resultClass="cminningscd">
|
<select id="cm.cminningscds.applyedu.my" parameterClass="hashtable" resultClass="cminningscd">
|
||||||
select
|
select
|
||||||
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment
|
a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment
|
||||||
|
|
@ -2329,6 +2326,5 @@
|
||||||
where a.cmno=#cmno# and a.isdel=0
|
where a.cmno=#cmno# and a.isdel=0
|
||||||
order by rsno<!--estkind,rno-->
|
order by rsno<!--estkind,rno-->
|
||||||
</select>
|
</select>
|
||||||
>>>>>>> ca8967d (추가개발1)
|
|
||||||
</statements>
|
</statements>
|
||||||
</sqlMap>
|
</sqlMap>
|
||||||
Loading…
Reference in New Issue