KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ㅁㅁㅁ

This commit is contained in:
김한진 2025-12-27 00:00:39 +09:00
parent 06773f17ae
commit 126c3cc556
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BO/obj/Debug/BO.csproj.AssemblyReference.cache
View File

Binary file not shown.

7
Dao/MyBatis/Maps/CM.xml
View File

@ -2250,10 +2250,8 @@
<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
,a.studyplace, a.studyplacename,a.remainPeople ,a.studyplace, a.studyplacename,a.remainPeople
@ -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>

BIN
FO/obj/Debug/FO.csproj.AssemblyReference.cache
View File

Binary file not shown.