Merge branch 'develop' into jmh

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

@@ -109,7 +109,7 @@
 		       (SELECT CONCAT(IFNULL(SUPPLY_COMP_CD,#{supplyCompCd}),'_',IFNULL(LPAD(SUBSTRING(MAX(DELV_FEE_CD),INSTR(MAX(DELV_FEE_CD),'_') + 1) + 1,2,'0'),'01'))
 		        FROM   TB_DELV_FEE_POLICY Z
 		        WHERE  SUPPLY_COMP_CD LIKE CONCAT(#{supplyCompCd},'%')
-		       )
+		        GROUP BY SUPPLY_COMP_CD)
 		     , #{supplyCompCd}
 		     , #{delvFeeCrite}
 		     , IFNULL(#{minOrdAmt},0)