Compare commits
3 Commits
05a3cfd5e8
...
126c3cc556
| Author | SHA1 | Date |
|---|---|---|
 김한진
|
126c3cc556 | |
|
김한진
|
06773f17ae | |
|
김한진
|
a46340cdd4 |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -2250,8 +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
|
||||||
|
|
@ -2329,6 +2327,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>
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in New Issue