Merge remote-tracking branch 'origin/ST24PRJ-127' into develop

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

@@ -238,7 +238,8 @@
 						<option value="50" selected="selected">50개씩 보기</option>
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
-						<!-- <option value="1000">1000개씩 보기</option> -->
+						<option value="1000">1000개씩 보기</option>
+						<option value="2000">2000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>