merge master into develop - CscListRForm.jsp FAQ 아코디언 버그 수정

2026-05-28 23:34:06 +09:00
parent e293ffe451 de463cbb8f
commit 3668cc89b2
7250 changed files with 570509 additions and 25 deletions
--- a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
+++ b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
@@ -3691,9 +3691,11 @@
            AND GMP.SOPMAL_CD = #{sopmalCd}
                 LEFT JOIN GC_MEMBER_GRAD MG ON GMP.MBR_GRAD_INNB = MG.MBR_GRAD_INNB
            AND GMP.SOPMAL_CD = MG.SOPMAL_CD
+            AND MG.USE_AT = 'Y'
                 LEFT JOIN GC_MEMBER_GRAD MG_NEXT
                           ON MG.MBR_GRAD_ORDR + 1 = MG_NEXT.MBR_GRAD_ORDR
                               AND MG.SOPMAL_CD = MG_NEXT.SOPMAL_CD
+                               AND MG_NEXT.USE_AT = 'Y'
                 LEFT JOIN GC_ORDER O ON MBR.MBR_DV_CD = O.MBR_DV_CD
            AND MBR.MBR_INNB = O.MBR_INNB
            AND O.USE_AT = 'Y'
--- a/src/main/resources/static/mngr/images/logo_default.png
+++ b/src/main/resources/static/mngr/images/logo_default.png