diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache index a7bdf91..d45bdb3 100644 Binary files a/BO/obj/Debug/BO.csprojAssemblyReference.cache and b/BO/obj/Debug/BO.csprojAssemblyReference.cache differ diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache index 27043c0..e978cbc 100644 Binary files a/Base/obj/Debug/Base.csprojAssemblyReference.cache and b/Base/obj/Debug/Base.csprojAssemblyReference.cache differ diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index 123f58a..2fe6ef8 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -497,7 +497,7 @@ ,cmis.estart cmiestart,cmis.eend cmieend from pay a inner join payitem b on b.payno=a.payno and b.ptype in (0,1,4) and b.pstatus in (1,21,22,51,55) - inner join cm c on c.cmno=b.itemno and c.rstime < now() and c.sstime > now() + inner join cm c on c.cmno=b.itemno and c.rstime < now() and c.retime > now() inner join term d on d.tmno=c.tmno inner join users u on u.userno=b.userno left outer join assign ua on ua.asno=u.asno diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index bea838b..5366cc5 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ diff --git a/FO/Views/Shared/_Layout.cshtml b/FO/Views/Shared/_Layout.cshtml index cb8e4ce..e710683 100644 --- a/FO/Views/Shared/_Layout.cshtml +++ b/FO/Views/Shared/_Layout.cshtml @@ -49,7 +49,7 @@ $("li.topsubmenu@(ViewBag.MenuPage.m1)").addClass("current"); $("li.topmenu@(ViewBag.MenuPage.m0)").addClass("current"); $(document).ready(function () { - $('a:contains("마이페이지")').css("color", "#0070C0"); + $(".gnbMenu").find("a:contains('마이페이지')").css("color", "#0070C0"); });