Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.scm.git into develop

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

@@ -951,11 +951,11 @@
 		       B.BRAND_ENM,';',
 		       B.BRAND_KNM,';',
 		       B.BRAND_GRP_NM,';',
-		       G.STYLE_YEAR,';',
-		       FN_GET_CODE_NM('G006',G.SEASON_CD),';',
-		       FN_GET_CODE_NM('G007',G.SEX_GB),';',
-		       COALESCE(D.COLOR_INFO,CONCAT(D.COLOR_INFO,';'),''),
-		       REPLACE(I.ITEMKIND_NM,'>',';')
+		       IF(NULLIF(G.STYLE_YEAR,'') IS NULL, '' ,CONCAT(G.STYLE_YEAR,';')), 
+		       IF(NULLIF(G.SEASON_CD, '') IS NULL, '' ,CONCAT(FN_GET_CODE_NM('G006',G.SEASON_CD),';')) ,
+		       IF(NULLIF( G.SEX_GB,'') IS NULL, '' ,CONCAT(FN_GET_CODE_NM('G007',G.SEX_GB),';')) ,
+		       IFNULL(COALESCE(D.COLOR_INFO,CONCAT(D.COLOR_INFO,';'),''),''),
+		       IFNULL(REPLACE(I.ITEMKIND_NM,'>',';'),'') 
 		       )) AS GOODS_SNM
 		FROM TB_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -160,7 +160,7 @@
 									</tr>
 									<tr>
 										<td rowspan="11">&nbsp;</td>
-										<th>시즌<em class="required" title="필수"></em></th>
+										<th>시즌</th>
 										<td >
 											<select  name="seasonCd" id="seasonCd">
 												<option value="">[선택]</option>
@@ -1189,15 +1189,17 @@
 			return;
 		}
 
-		//시즌
-		if(gagajf.isNull($("#goodsDetailForm select[name=seasonCd]").val())){
-			mcxDialog.alertC("시즌을 선택해 주세요.", {
-				sureBtnText: "확인",
-				sureBtnClick: function() {
-					$("#goodsDetailForm select[name=seasonCd]").focus();
-				}
-			});
-			return;
+		//시즌 - 입점은 필수 제외
+		if ("Y" == $("#goodsDetailForm input[name=selfGoodsYn]").val()){
+			if(gagajf.isNull($("#goodsDetailForm select[name=seasonCd]").val())){
+				mcxDialog.alertC("시즌을 선택해 주세요.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$("#goodsDetailForm select[name=seasonCd]").focus();
+					}
+				});
+				return;
+			}	
 		}
 		
 		//성별