From 0751ad62373c2e7f72b35ead6047fae889cf0d76 Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Mon, 14 Dec 2020 00:27:37 +0000
Subject: [PATCH]

---
 BO/obj/Debug/BO.csprojAssemblyReference.cache | Bin 424 -> 15527 bytes
 .../Debug/Base.csprojAssemblyReference.cache  | Bin 8781 -> 8781 bytes
 Dao/MyBatis/Maps/Pay.xml                      |   2 +-
 .../Debug/Dao.csprojAssemblyReference.cache   | Bin 4091 -> 4091 bytes
 FO/Views/Shared/_Layout.cshtml                |   2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BO/obj/Debug/BO.csprojAssemblyReference.cache b/BO/obj/Debug/BO.csprojAssemblyReference.cache
index a7bdf91612271316a725622f87c408ecc8c7d9e7..d45bdb3ae70ce85c3ae8f144582750ea3cbaa511 100644
GIT binary patch
literal 15527
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

delta 28
ecmZ2pxq^9vKO-a4<N!u5J_aBVU;~jrzzqOjR|G5o

diff --git a/Base/obj/Debug/Base.csprojAssemblyReference.cache b/Base/obj/Debug/Base.csprojAssemblyReference.cache
index 27043c0efc6a05650898f71f0999dbf6825fa67c..e978cbca82ad4602605bac03301ff65740b6c423 100644
GIT binary patch
delta 18
acmX@>a@J+T5hm7GOMMQn+I*6!MIHcJAqfWn

delta 18
acmX@>a@J+T5hhmqSJ(WOZ9d7=A`bvo<p{C>

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 &lt; now() and c.sstime &gt; now()
+            inner join cm c on c.cmno=b.itemno and c.rstime &lt; now() and c.retime &gt; 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 bea838bf33a698519ceea08cadd8b67f01024a0d..5366cc5764287c57625d0092e340df30f4618a59 100644
GIT binary patch
delta 18
acmew@|66{;2`1Jl3*`^5+I*Htj~4(|I|woW

delta 18
acmew@|66{;2`1J)&ozF_HlJnE;{^az1PAB<

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");
         });
     </script>
 </body>