Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/web/TsaGoodsController.java

@@ -804,7 +804,7 @@ public class TsaGoodsController extends TsaBaseController {
 		int toYear = Integer.parseInt(GagaDateUtil.getToday("yyyy")) - 4;
 		mav.addObject("styleYearList", rendererService.getYearList(toYear, 0, 5));
 		// 회원등급
-		//mav.addObject("custGradeList", rendererService.getAvailCommonCodeList("G101"));
+		//mav.addObject("custGradeList", rendererService.getAvailCommonCodeList("G110"));
 
 		mav.addObject("params", goods);
 

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

@@ -2277,7 +2277,7 @@
 	
 	$(document).ready(function() {
 		
-		cfnCreateCheckbox("/renderer/avail/commonCode/list/G101", $('#goodsCustGradeList'), "goodsOrderGrade");
+		cfnCreateCheckbox("/renderer/avail/commonCode/list/G110", $('#goodsCustGradeList'), "goodsOrderGrade");
 
 		gagaAgGrid.createGrid('gridGoodsHstoryList', gridGoodsHstoryOptions);
 		gagaAgGrid.createGrid('gridGoodsComposeList', gridGoodsComposeOptions);