Merge branch 'develop' into jmh

src/main/webapp/WEB-INF/views/settle/GoodsSettleForm.html

@@ -183,7 +183,8 @@
 		{ headerName: "브랜드", field: "brandEnm", width: 100, cellClass: 'text-center' },
 		{ headerName: "담당MD", field: "mdNm", width: 100, cellClass: 'text-center' },
 		{ headerName: "단품코드", field: "itemCd", width: 120, cellClass: 'text-center' },
-		{ headerName: "옵션", field: "optCd1", width: 100, cellClass: 'text-center' },
+		{ headerName: "옵션1", field: "optCd1", width: 100, cellClass: 'text-center' },
+		{ headerName: "옵션2", field: "optCd2", width: 100, cellClass: 'text-center' },
 		{
 			headerName: "정산판매가", field: "mallPrice", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }