Merge branch 'sowon' into develop

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

@@ -215,8 +215,8 @@
 		<if test="socialSq != null and socialSq != ''">
 		AND A.SOCIAL_SQ != #{socialSq}
 		</if>
-		AND A.SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S')
-		AND A.SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S');
+		AND A.SOCIAL_STDT <![CDATA[ >= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S')
+		AND A.SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S');
 	</select>
 	
 	

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

@@ -270,6 +270,7 @@
 				}else{
 					return  params.value.replaceAll(">", ">");
 				}
+			}
 		},
 		{headerName: "전시재고", field: "stockQtySum", width: 100, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();}