Merge remote-tracking branch 'origin/style' into ST24PRJ-333(무료배송)

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

@@ -1998,7 +1998,7 @@
 					ELSE (IFNULL((SELECT CONCAT(USER_NM,
 										' / ',USER_ID)
 						  FROM   TB_USER
-						  WHERE  USER_NO = OC.REG_NO),'회원'
+						  WHERE  USER_NO = OC.REG_NO AND (ROLE_CD='G001_0000' OR ROLE_CD LIKE 'G001_A3%')),'회원'
 						 ))
 			   END,' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))  AS REG_NM /*신청(접수)자정보*/
 		  FROM TB_ORDER_CHANGE_DETAIL OCD