From 126c3cc55643e29b2b30fa169db6e426e16f2532 Mon Sep 17 00:00:00 2001
From: KimHanJin <grips76@kakao.com>
Date: Sat, 27 Dec 2025 00:00:39 +0900
Subject: [PATCH] =?UTF-8?q?=E3=85=81=E3=85=81=E3=85=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Debug/BO.csproj.AssemblyReference.cache   | Bin 11827 -> 11827 bytes
 Dao/MyBatis/Maps/CM.xml                       |   7 ++-----
 .../Debug/FO.csproj.AssemblyReference.cache   | Bin 3049 -> 3049 bytes
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/BO/obj/Debug/BO.csproj.AssemblyReference.cache b/BO/obj/Debug/BO.csproj.AssemblyReference.cache
index d6672333a181f84281ecca6df804777056c6d0e3..a5a94445860fe8f9b9236ed1f8eedc180fe1f81b 100644
GIT binary patch
delta 29
kcmdlSvpHtN1SQs<ikSxeo2M#0V`tr|J{QPr(Avxl0L6d|jQ{`u

delta 29
kcmdlSvpHtN1SQr)Cf8-Xo2M#0V`n`P<_TmrXl-T&0KIw)Y5)KL

diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index c8186db..445bfb1 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -2250,10 +2250,8 @@
         <isNotNull property="year">and year(a.sstime)=#year#</isNotNull>
         order by a.sstime,a.setime 
       </select>
-<<<<<<< HEAD
-=======
-	
-        <select id="cm.cminningscds.applyedu.my" parameterClass="hashtable" resultClass="cminningscd">
+
+		<select id="cm.cminningscds.applyedu.my" parameterClass="hashtable" resultClass="cminningscd">
             select
                 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
@@ -2329,6 +2327,5 @@
 			where a.cmno=#cmno# and a.isdel=0
 			order by rsno<!--estkind,rno-->
 		</select>
->>>>>>> ca8967d (추가개발1)
     </statements>
 </sqlMap>
\ No newline at end of file
diff --git a/FO/obj/Debug/FO.csproj.AssemblyReference.cache b/FO/obj/Debug/FO.csproj.AssemblyReference.cache
index 43b4d60e63bb770fa22a5c302cc8ea6436d192b8..c040dc5b8c388ae647fc065d2ec3060680654bc6 100644
GIT binary patch
delta 37
tcmaDU{!)B`8*5L+OoRT7-p|-McB;=c=y$otG1-tweqx@`<}8kSW&kDY4lDow

delta 37
tcmaDU{!)B`8*3ty>$2XB-p|-MPK0?b>vg%uG1-tweqx@`<}8kSW&j-s4haAN