Merge branch 'eskim' into develop

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

@@ -171,8 +171,8 @@
 	</select>
 
 	<!-- 권한별 브랜드 목록 -->
-	<select id="getAuthBrandList" parameterType="int" resultType="CommonCode">
-		/* TssRenderer.getAuthBrandList */
+	<select id="getAuthBrandList_org" parameterType="int" resultType="CommonCode">
+		/* TssRenderer.getAuthBrandList_org */
 		SELECT A.BRAND_CD  AS CD
 		     , A.BRAND_ENM AS CD_NM
 		FROM   TB_BRAND A

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -93,7 +93,7 @@ public class TssGoodsService {
 	private ObjectMapper mapper;
 
 	private static final String NUMBER_PATTERN = "^[0-9]+$";
-	
+
 	private static final String ALPHA_NUMERIC = "^[a-zA-Z0-9]$";
 
 	private static final String UPDATE_NO_PATTERN = "X";
@@ -1268,14 +1268,14 @@ public class TssGoodsService {
 			goodsDesc.setGoodsDesc(goodsMass.getGoodsContent().trim());
 			this.saveGoodsDesc(goodsDesc);
 		}
-		
+
 		// 상품상세 상품 상세 특징 확인
 		if (!StringUtils.isBlank(goodsMass.getGoodsCharacter())) {
 			goodsDesc.setDescGb("30");
 			goodsDesc.setGoodsDesc(goodsMass.getGoodsCharacter().trim());
 			this.saveGoodsDesc(goodsDesc);
 		}
-		
+
 		// 사용자 검색어를 검색어에 적용
 		String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
 		if (!StringUtils.isBlank(goods.getGoodsSnm1())) {
@@ -1540,7 +1540,7 @@ public class TssGoodsService {
 		String supplyCompCd = brandSupplyList.iterator().next().getSupplyCompCd();
 		goods.setSupplyCompCd(supplyCompCd); // 업체코드
 		goodsMass.setSupplyCompCd(supplyCompCd); // 업체 코드
-		
+
 		// 판매수수료율
 		SupplyCompany supplyCompany = new SupplyCompany();
 		supplyCompany.setSupplyCompCd(goods.getSupplyCompCd());
@@ -1548,14 +1548,14 @@ public class TssGoodsService {
 		if (supplyCompanyList == null || supplyCompanyList.isEmpty()) {
 			throw new IllegalStateException(message.getMessage("상품의 업체 판매수수율를 확인해 주세요."));
 		}
-		
+
 		goods.setSellFeeRate(supplyCompanyList.iterator().next().getSellFeeRate()); // 판매수수료율
 
 		// 배송비 정책 적용
 		Collection<CommonCode> supplyDeliveryFeePolicyList = rendererService.getSupplyDeliveryFeePolicyList(goods.getSupplyCompCd());
 		if (supplyDeliveryFeePolicyList != null && !supplyDeliveryFeePolicyList.isEmpty()) {
 			goods.setDelvFeeCd(supplyDeliveryFeePolicyList.iterator().next().getCd());
-		}else {
+		} else {
 			throw new IllegalStateException(message.getMessage("상품의 업체 배송비정책을 확인해 주세요."));
 		}
 
@@ -1611,7 +1611,7 @@ public class TssGoodsService {
 				return goods;
 			}
 		}
-		
+
 		// 상품상세 상품 상세 특징 확인
 		if (!StringUtils.isBlank(goodsMass.getGoodsCharacter())) {
 			if (goodsMass.getGoodsCharacter().toLowerCase().indexOf("script") >= 0) {
@@ -1620,7 +1620,7 @@ public class TssGoodsService {
 				return goods;
 			}
 		}
-		
+
 		goods.setGoodsType("G056_N"); //상품타입
 		goods.setFormalGb("G009_10"); // 정상이월 구분
 		goods.setGoodsGb("G073_11"); //상품구분
@@ -2019,13 +2019,13 @@ public class TssGoodsService {
 			goods.setGoodsStat("10");
 			return goods;
 		}
-		
+
 		if (!GagaStringUtil.replace(goodsMass.getSupplyGoodsCd().trim(), ",", "").matches(ALPHA_NUMERIC)) {
 			goods.setGoodsRegMsg("공급업체 상품코드 오류");
 			goods.setGoodsStat("10");
 			return goods;
 		}
-		
+
 		goods.setSupplyGoodsCd(goodsMass.getSupplyGoodsCd().trim().toUpperCase());
 
 		if (StringUtils.isBlank(goodsMass.getSupplyCompCd())) {
@@ -2213,7 +2213,7 @@ public class TssGoodsService {
 
 		float pntPrate = 0f;
 		float pntMrate = 0f;
-		
+
 		for (Brand tmpBrand : brandList) {
 			if ("G009_10".equals(goods.getFormalGb())) {
 				pntPrate = tmpBrand.getPntPrate10();
@@ -2222,10 +2222,10 @@ public class TssGoodsService {
 				pntPrate = tmpBrand.getPntPrate20();
 				pntMrate = tmpBrand.getPntMrate20();
 			}
-				}
+		}
 		goods.setPntPrate(pntPrate); // 포인트적립율(PC)
 		goods.setPntMrate(pntMrate); // 포인트적립율(MOBILE)
-		
+
 		// 판매수수료율
 		SupplyCompany supplyCompany = new SupplyCompany();
 		supplyCompany.setSupplyCompCd(goods.getSupplyCompCd());
@@ -2235,14 +2235,14 @@ public class TssGoodsService {
 			goods.setGoodsStat("10");
 			return goods;
 		}
-		
+
 		goods.setSellFeeRate(supplyCompanyList.iterator().next().getSellFeeRate()); // 판매수수료율
 
 		// 배송비 정책 적용
 		boolean deliveryFolicy = false;
 		Collection<CommonCode> supplyDeliveryFeePolicyList = rendererService.getSupplyDeliveryFeePolicyList(goods.getSupplyCompCd());
 		if (supplyDeliveryFeePolicyList != null && !supplyDeliveryFeePolicyList.isEmpty()) {
-			for(CommonCode supplyDeliveryFeePolicy: supplyDeliveryFeePolicyList) {
+			for (CommonCode supplyDeliveryFeePolicy : supplyDeliveryFeePolicyList) {
 				if (goodsMass.getDelvFeeCd().equals(supplyDeliveryFeePolicy.getCd())) {
 					deliveryFolicy = true;
 					break;
@@ -2253,12 +2253,12 @@ public class TssGoodsService {
 				goods.setGoodsStat("10");
 				return goods;
 			}
-		}else {
+		} else {
 			goods.setGoodsRegMsg("배송비정책 오류");
 			goods.setGoodsStat("10");
 			return goods;
 		}
-		
+
 		// 배송비 정책
 		goods.setDelvFeeCd(goodsMass.getDelvFeeCd()); // 화면에서 받은값
 
@@ -2404,7 +2404,7 @@ public class TssGoodsService {
 	public String updateMassExceluploadGoods(GagaMap gagaMap, String procJob) {
 
 		// 사용자의 관리 브랜드 조회
-		Collection<CommonCode> mdBrandList = rendererService.getAuthBrandList(TssSession.getInfo().getUserNo());
+		Collection<CommonCode> mdBrandList = rendererService.getSupplyCompanyBrandList(TssSession.getInfo().getSupplyCompCd());
 
 		GoodsMass goodsMass = mapper.convertValue(gagaMap, GoodsMass.class);
 
@@ -3494,7 +3494,6 @@ public class TssGoodsService {
 		}
 	}
 
-	
 	/**
 	 * 상품정보고시 항목 목록
 	 * 
@@ -3523,11 +3522,11 @@ public class TssGoodsService {
 		if (goodsDup != null) {
 			throw new IllegalStateException("업체상품코드 중복요청입니다.");
 		}
-		
+
 		log.info("[createGoodsDetail 11] goods=>{}", goods);
 		// 상품코드 생성
 		goods.setGoodsCd(this.getGoodsCodeSeq("E", goods.getBrandCd())); // 입점상품 상품코드 생성
-		
+
 		// <,> replace 처리
 		goods.setRegNo(TssSession.getInfo().getUserNo());
 		goods.setUpdNo(TssSession.getInfo().getUserNo());
@@ -3541,11 +3540,11 @@ public class TssGoodsService {
 		goods.setGoodsNm(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsNm(), "&lt;", "<"), "&gt;", ">"));
 		goods.setGoodsTnm(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsTnm(), "&lt;", "<"), "&gt;", ">"));
 		goods.setGoodsSnm1(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsSnm1(), "&lt;", "<"), "&gt;", ">"));
-		
+
 		// 판매기간설정 eskim
 		goods.setSellStdt(goods.getSellStYMD().replaceAll("-", "") + goods.getSellStHH() + "0000");
 		goods.setSellEddt(goods.getSellEdYMD().replaceAll("-", "") + goods.getSellEdHH() + "5959");
-		
+
 		// 판매수수료율
 		SupplyCompany supplyCompany = new SupplyCompany();
 		supplyCompany.setSupplyCompCd(goods.getSupplyCompCd());
@@ -3553,14 +3552,14 @@ public class TssGoodsService {
 		if (supplyCompanyList == null || supplyCompanyList.isEmpty()) {
 			throw new IllegalStateException("업체정보를 확인해 주세요.");
 		}
-		
+
 		goods.setSellFeeRate(supplyCompanyList.iterator().next().getSellFeeRate()); // 판매수수료율
 
 		log.info("[createGoodsDetail 22 ] goods=>{}", goods);
 		// 기본정보 생성
 		goodsDao.createGoods(goods); // 상품기본 저장
 		goodsDao.createGoodsSmmary(goods); // 상품통계 생성
-		
+
 		// 사용자 검색어를 검색어에 적용
 		String goodsSnm = goodsDao.getGoodsSnm(goods.getGoodsCd());
 		if (!StringUtils.isBlank(goods.getGoodsSnm1())) {
@@ -3578,10 +3577,10 @@ public class TssGoodsService {
 		}
 
 		log.info("[createGoodsDetail 33 ] goods.getGoodsSnm()=>{}", goods.getGoodsSnm());
-		
+
 		// 상품타이틀 수정
 		goodsDao.updateGoodsSnm(goods);
-		
+
 		// 상품상세정보 저장
 		this.saveGoodsDetailDesc(goods);
 
@@ -3611,7 +3610,7 @@ public class TssGoodsService {
 
 		// 상품 정보고시 변경
 		this.saveGoodsNotiInfo(goods);
-				
+
 		// 전시카테고리 작업
 		goodsDao.createCategoryGoods(goods);
 
@@ -3630,7 +3629,7 @@ public class TssGoodsService {
 	public GoodsImg getGoodsModelInfo(GoodsImg goodsImg) {
 		return goodsDao.getGoodsModelInfo(goodsImg);
 	}
-	
+
 	/**
 	 * 상품 모델 정보 저장
 	 *

src/main/java/com/style24/scm/biz/service/TssRendererService.java

@@ -281,6 +281,7 @@ public class TssRendererService {
 	public Collection<CommonCode> getSupplyCompanyBrandList(String supplyCompCd) {
 		Brand brand = new Brand();
 		brand.setSupplyCompCd(supplyCompCd);
+		brand.setUseYn("Y");
 		return rendererDao.getBrandList(brand);
 	}
 

src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -79,7 +79,7 @@ public class TssGoodsController extends TssBaseController {
 
 	@Autowired
 	private TssRendererService rendererService;
-	
+
 	@Autowired
 	private TssBusinessService businessService;
 
@@ -87,7 +87,7 @@ public class TssGoodsController extends TssBaseController {
 	private TssCommonService commonService;
 
 	private static final int EXCEL_ROW_COUNT = 1000;
-	
+
 	/**
 	 * 상품목록 화면
 	 *
@@ -336,9 +336,9 @@ public class TssGoodsController extends TssBaseController {
 
 		//건수
 		if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
-			throw new IllegalStateException("엑셀 파일의 건수를 " +EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
+			throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 		}
-		
+
 		Collection<Goods> goodsList = new ArrayList<>();
 		for (GagaMap map : ecxelGoodsList) {
 			Goods tmpGoods = mapper.convertValue(map, Goods.class);
@@ -419,7 +419,7 @@ public class TssGoodsController extends TssBaseController {
 		// 정보고시 분류
 		mav.addObject("niClsfCdList", rendererService.getAvailCommonCodeList("G004"));
 		// 사용자 브랜드 조회
-		mav.addObject("authBrandList", rendererService.getAuthBrandList(TssSession.getInfo().getUserNo()));
+		mav.addObject("authBrandList", rendererService.getSupplyCompanyBrandList(TssSession.getInfo().getSupplyCompCd()));
 		// 상품타입
 		mav.addObject("goodsTypeList", rendererService.getAvailCommonCodeList("G056"));
 		// 상품구분
@@ -615,7 +615,7 @@ public class TssGoodsController extends TssBaseController {
 				if (goodsImgInfo.getDefaultImgYn().equals("Y")) {
 					mav.addObject("defaultImgOrd", goodsImgInfo.getDispOrd());
 				}
-				if (goodsImgInfo.getMouseoverImgYn() .equals("Y")) {
+				if (goodsImgInfo.getMouseoverImgYn().equals("Y")) {
 					mav.addObject("mouseoverImgOrd", goodsImgInfo.getDispOrd());
 				}
 			}
@@ -626,11 +626,11 @@ public class TssGoodsController extends TssBaseController {
 		}
 
 		GoodsImg goodsModelInfo = goodsService.getGoodsModelInfo(goodsImg);
-		
+
 		if (goodsModelInfo != null) {
-			mav.addObject("modelInfo", goodsModelInfo.getModelInfo());	
-		}else {
-			mav.addObject("modelInfo", "");	
+			mav.addObject("modelInfo", goodsModelInfo.getModelInfo());
+		} else {
+			mav.addObject("modelInfo", "");
 		}
 		mav.addObject("goodsImg", goodsImg);
 		mav.setViewName("goods/GoodsImageForm");
@@ -664,10 +664,10 @@ public class TssGoodsController extends TssBaseController {
 
 		// 1.업로드된 파일 rename 및 순서 재정렬
 		for (GoodsImg goodsImg : goodsImgList) {
-			
+
 			goodsModelInfo.setGoodsCd(goodsImg.getGoodsCd());
 			goodsModelInfo.setModelInfo(goodsImg.getModelInfo());
-			
+
 			// dx5에서 삭제한 파일은 skip
 			if (goodsImg.getMode().equals("D")) {
 				continue;
@@ -749,7 +749,7 @@ public class TssGoodsController extends TssBaseController {
 
 		// 상품이미지 저장 처리
 		goodsService.saveGoodsImageList(goodsImgList);
-		
+
 		// 모델정보 처리
 		goodsModelInfo.setRegNo(TssSession.getInfo().getUserNo());
 		goodsModelInfo.setUpdNo(TssSession.getInfo().getUserNo());
@@ -856,9 +856,9 @@ public class TssGoodsController extends TssBaseController {
 
 			//건수
 			if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
-				throw new IllegalStateException("엑셀 파일의 건수를 " +EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
+				throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 			}
-			
+
 			for (GagaMap gagaMap : ecxelGoodsList) {
 				goodsService.createExceluploadSelfGoods(gagaMap, goodsMass.getProcJob());
 			}
@@ -867,7 +867,7 @@ public class TssGoodsController extends TssBaseController {
 			// 입점상품등록
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정 -
 			String[] goodsNames = {"supplyGoodsCd", "supplyCompCd", "brandCd", "goodsNm", "goodsTnm", "goodsSnm1", "itemkindCd",
-				"sexGb", "listPrice", "currPrice", "goodsGb", "formalGb", "originCd", "makeYmd", "taxGb", "ageGrpCd", "adultYn", 
+				"sexGb", "listPrice", "currPrice", "goodsGb", "formalGb", "originCd", "makeYmd", "taxGb", "ageGrpCd", "adultYn",
 				"certNum", "optStr", "goodsContent",
 				"niClsfCd", "niContent1", "niContent2", "niContent3", "niContent4", "niContent5",
 				"niContent6", "niContent7", "niContent8", "niContent9", "niContent10", "niContent11", "niContent12",
@@ -881,9 +881,9 @@ public class TssGoodsController extends TssBaseController {
 			if (ecxelGoodsList != null && ecxelGoodsList.size() > 100) {  //안전인증 로직 추가로 건수 줄임
 				throw new IllegalStateException("엑셀 파일의 건수를 100 건 이하로 사용하세요.");
 			}
-			
+
 			// 사용자의 관리 브랜드 조회
-			Collection<CommonCode> mdBrandList = rendererService.getAuthBrandList(TssSession.getInfo().getUserNo());
+			Collection<CommonCode> mdBrandList = rendererService.getSupplyCompanyBrandList(TssSession.getInfo().getSupplyCompCd());
 
 			if ("G001_B000".equals(TssSession.getInfo().getRoleCd())) {
 				if (mdBrandList == null || mdBrandList.isEmpty()) {
@@ -925,8 +925,8 @@ public class TssGoodsController extends TssBaseController {
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정 -
 		String[] goodsNames = {"goodsCd", "goodsNm", "goodsTnm", "goodsSnm1", "itemkindCd", "seasonCd",
 			"sexGb", "currPrice", "sellFeeRate", "goodsGb", "formalGb", "minOrdQty", "maxOrdQty", "dayMaxOrdQty",
-			"giftPackYn", "newCustOrdYn","pntPrate","prePpntUsableYn", "pntMrate","preMpntUsableYn",
-			"returnableYn", "changeableYn","taxGb", "ageGrpCd", "adultYn", "delvFeeCd", "optStr","goodsContent",
+			"giftPackYn", "newCustOrdYn", "pntPrate", "prePpntUsableYn", "pntMrate", "preMpntUsableYn",
+			"returnableYn", "changeableYn", "taxGb", "ageGrpCd", "adultYn", "delvFeeCd", "optStr", "goodsContent",
 			"niClsfCd", "niContent1", "niContent2",
 			"niContent3", "niContent4", "niContent5", "niContent6", "niContent7", "niContent8", "niContent9",
 			"niContent10", "niContent11", "niContent12", "niContent13", "niContent14", "niContent15", "niContent16",
@@ -942,9 +942,9 @@ public class TssGoodsController extends TssBaseController {
 
 		//건수
 		if (ecxelGoodsList != null && ecxelGoodsList.size() > EXCEL_ROW_COUNT) {
-			throw new IllegalStateException("엑셀 파일의 건수를 " +EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
+			throw new IllegalStateException("엑셀 파일의 건수를 " + EXCEL_ROW_COUNT + "건 이하로 사용하세요.");
 		}
-		
+
 		for (GagaMap gagaMap : ecxelGoodsList) {
 			goodsService.updateMassExceluploadGoods(gagaMap, goodsMass.getProcJob());
 		}
@@ -1205,7 +1205,6 @@ public class TssGoodsController extends TssBaseController {
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
-
 	/**
 	 * 사은품 화면
 	 * @return
@@ -1321,15 +1320,15 @@ public class TssGoodsController extends TssBaseController {
 		String selfYn = "N";
 		String supplyCompCd = TssSession.getInfo().getSupplyCompCd();
 		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd, selfYn));
-		
+
 		SupplyCompany supplyCompany = new SupplyCompany();
 		supplyCompany.setSupplyCompCd(supplyCompCd);
-		Collection<SupplyCompany> supplyCompanyInfoList = businessService.getSupplyCompanyList(supplyCompany); 
+		Collection<SupplyCompany> supplyCompanyInfoList = businessService.getSupplyCompanyList(supplyCompany);
 		mav.addObject("supplyCompanyInfo", supplyCompanyInfoList.iterator().next());
-		
+
 		// 배송비정보
 		mav.addObject("delvFeeCdList", rendererService.getSupplyDeliveryFeePolicyList(supplyCompCd));
-				
+
 		String[] goodsStatExceptCds = {"G008_00"};
 		mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", goodsStatExceptCds));
 
@@ -1346,13 +1345,13 @@ public class TssGoodsController extends TssBaseController {
 		// 정보고시 분류
 		mav.addObject("niClsfCdList", rendererService.getAvailCommonCodeList("G004"));
 		// 사용자 브랜드 조회
-		mav.addObject("authBrandList", rendererService.getAuthBrandList(TssSession.getInfo().getUserNo()));
+		mav.addObject("authBrandList", rendererService.getSupplyCompanyBrandList(TssSession.getInfo().getSupplyCompCd()));
 		// 상품타입
 		mav.addObject("goodsTypeList", rendererService.getAvailCommonCodeList("G056"));
 		// 상품구분
 		mav.addObject("goodsGbList", rendererService.getAvailCommonCodeList("G073"));
 		// 유통구분
-		String[] distributionGbExceptCds = {"G065_10","G065_11","G065_12"};
+		String[] distributionGbExceptCds = {"G065_10", "G065_11", "G065_12"};
 		mav.addObject("distributionGbList", rendererService.getCommonCodeList("G065", "Y", distributionGbExceptCds));
 		// 상품연령대
 		mav.addObject("ageGrpCdList", rendererService.getAvailCommonCodeList("G023"));
@@ -1369,7 +1368,7 @@ public class TssGoodsController extends TssBaseController {
 
 		return mav;
 	}
-	
+
 	/**
 	 * 상품의 정보고시 항목 목록
 	 *
@@ -1383,7 +1382,7 @@ public class TssGoodsController extends TssBaseController {
 	public Collection<NotiInfo> getNotiInfoItemList(NotiInfo notiInfo) {
 		return goodsService.getNotiInfoItemList(notiInfo);
 	}
-	
+
 	/**
 	 * 입점 상품 등록
 	 *
@@ -1406,7 +1405,7 @@ public class TssGoodsController extends TssBaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-	
+
 		goods.setNotiListNew(notiList);
 
 		goodsService.createGoodsDetail(goods);

src/main/java/com/style24/scm/biz/web/TssRendererController.java

@@ -80,7 +80,8 @@ public class TssRendererController extends TssBaseController {
 	@GetMapping("/brand/AuthBrandlist")
 	@ResponseBody
 	public Collection<CommonCode> getAuthBrandList() {
-		return rendererService.getAuthBrandList(TssSession.getInfo().getUserNo());
+		//rendererService.getAuthBrandList(TssSession.getInfo().getUserNo());
+		return rendererService.getSupplyCompanyBrandList(TssSession.getInfo().getSupplyCompCd());
 	}
 
 //	/**

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

@@ -860,7 +860,10 @@
 			gagaSn.setContents('#goodsMobileTopDesc', result.goodsMobileTopDesc); 
 			gagaSn.setContents('#goodsPcDownDesc', result.goodsPcDownDesc); 
 			gagaSn.setContents('#goodsMobileDownDesc', result.goodsMobileDownDesc);
-			gagaSn.setContents('#goodsDesc', result.goodsDesc);
+			
+			// asis html 변경
+			//gagaSn.setContents('#goodsDesc', result.goodsDesc);
+			gagaSn.setContents('#goodsDesc', result.goodsDesc.replaceAll('src="/Upload' , 'src="'+_imgUrl+'/Local'));
 
 			if (!gagajf.isNull(result.niClsfNm)){
 				$('#goodsDetailForm').find('#itemkindNoti').html('품목기준 고시분류 : ' + result.niClsfNm);

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

@@ -32,11 +32,11 @@
 			<div class="panelContent">
 				<table class="frmStyle">
 					<colgroup>
-						<col width="10%"/>
-						<col width="23%"/>
-						<col width="10%"/>
-						<col width="23%"/>
-						<col width="10%"/>
+						<col width="9%"/>
+						<col width="42%"/>
+						<col width="9%"/>
+						<col width="15%"/>
+						<col width="9%"/>
 						<col/>
 					</colgroup>
 					<tr>