Merge branch 'sowon' into develop

src/main/java/com/style24/persistence/domain/Plan.java

@@ -80,7 +80,7 @@ public class Plan extends TscBaseDomain{
 		private String custJoinStdt;		//회원가입시작일시
 		private String custJoinEddt;		//회원가입종료일시
 		private String sysImgNm;			//이미지
-		private String brandNm;
+		private String brandNm;				//브랜드이름
 
 		// 기획전 소스
 		private Integer seq;					//일련번호

src/main/java/com/style24/persistence/mybatis/shop/TsaPlan.xml

@@ -740,7 +740,8 @@
                       , DISP_STDT       
                       , DISP_EDDT       
                       , CORNER_DISP_TYPE
-                      , CORNER_NM       
+                      , CORNER_NM  
+                      , BRAND_GROUP_NO     
                       , DISP_ORD        
                       , REG_NO          
                       , REG_DT          
@@ -753,7 +754,8 @@
                      , DATE_FORMAT(#{dispStdt} , '%Y-%m-%d %H:%i:%s')     
                      , DATE_FORMAT(#{dispEddt} , '%Y-%m-%d %H:%i:%s')   
                      , #{cornerDispType}                                 
-                     , #{cornerNm}                                       
+                     , #{cornerNm} 
+                     , #{brandGroupNo}                                      
                      , #{dispOrd}                                        
                      , #{regNo}                                          
                      , now()                                           
@@ -1515,6 +1517,7 @@
 	<select id="getShotSelfBrandList" parameterType="Plan" resultType="Plan">
 		/* TsaPlan.getShotSelfBrandList */
 		SELECT  B.BRAND_CD 
+		      , BG.BRAND_GROUP_NO 
 		      , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
 		                  ELSE BG.BRAND_GROUP_KNM
 		        END                                                    AS BRAND_NM

src/main/webapp/WEB-INF/views/marketing/PlanCornerListForm.html

@@ -57,13 +57,13 @@
 					<ul class="panelBar">
 						<li class="boxContentBtnT" style="margin-left: -20px; margin-right: -23px;">
 							<span class="btnLeft">
-								<button type="button" class="btn btn-warning btn-sm" id="btnAddRow">행추가</button>
+								<button type="button" class="btn btn-warning btn-sm" th:if="${planInfo.planGb != 'S'}" id="btnAddRow">행추가</button>
 								<button type="button" class="btn btn-danger btn-sm" id="btnDeleteRow">행삭제</button>
 							</span> 
 						</li>
 						<li class="right">
 							<span class="btnRight"> 
-								<button type="button" class="btn btn-default btn-lg" onclick="fnCornerCopyPopup();">코너복사</button>
+								<button type="button" class="btn btn-default btn-lg" th:if="${planInfo.planGb != 'S'}" onclick="fnCornerCopyPopup();">코너복사</button>
 								<button type="button" class="btn btn-success btn-lg" onclick="fnPlanCornerSave();">저장</button>
 						   </span>
 					   </li>