Merge remote-tracking branch 'origin/develop' into card007

src/main/java/com/style24/core/biz/service/TscShoplinkerService.java

@@ -162,7 +162,7 @@ public class TscShoplinkerService {
 			currListCount = map.getInt("currListCount");
 
 			DecimalFormat formatter = new DecimalFormat("###,###");
-			slkSearch.setTxt(fileAddNm+" ["+shoplinkerOrder.getInfoStr()+"]"+ " 총페이지: "+totalPage+ "("+formatter.format(totalCount)+"건) || "+currentlyPage);
+			slkSearch.setTxt(chkPermission+" ["+shoplinkerOrder.getInfoStr()+"]"+ " 총페이지: "+totalPage+ "("+formatter.format(totalCount)+"건) || "+currentlyPage);
 			updateCallApiRunable(slkSearch);
 
 			if( currentlyPage < 1 ) currentlyPage = 1;