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

build/resources/main/mybatis/xml/mapper/itrnt/ntcn/stl/BOItrntStlMssageMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wb.domainserver.domain.itrnt.ntcn.stl.mapper.BOItrntStlMssageMapper">
+    <select id="selectBOItrntStoreList"
+        resultType="dataMap">
+        SELECT
+            GS.STR_INNB
+            , GS.TENTCPN_ID
+            , GS.TENTCPN_NM
+        FROM GC_STORE GS
+        WHERE 1=1
+<!--            <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(sopmalCd)">-->
+<!--                AND GS.REPRSNT_BRAND = #{sopmalCd}-->
+<!--            </if>-->
+            <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(strInnb)">
+                AND GS.STR_INNB = #{strInnb}
+           </if>
+            AND GS.TENTCPN_ID != 'base'
+            AND GS.MRHST_AT = 'Y'
+            AND GS.REPRSNT_MNGR_AT = 'Y'
+        ORDER BY GS.STR_INNB DESC
+    </select>
+</mapper>