Merge remote-tracking branch 'TSIT/ST24PRJ-15' into style

src/main/java/com/style24/persistence/domain/Order.java

@@ -842,4 +842,6 @@ public class Order extends TscBaseDomain {
 	private String addPayCostPayYn;
 	private String addPayCostPgGb;
 	
+	private String csChargeNm;		/*CS담당자*/
+	
 }

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

@@ -1529,6 +1529,7 @@
 		     , A.SUPPLY_COMP_NM
 		     , A.ORD_CHG_SQ
 		     , A.SHOT_DELV_GB
+		     , A.CS_CHARGE_NM
 		FROM (
 		    SELECT OD.ORD_NO
 		         , OD.ORD_EXCH_GB
@@ -1628,6 +1629,9 @@
 		                         ELSE '업체'
 		                    END
 		           END AS SHOT_DELV_GB /*총알배송구분*/
+		         , (SELECT CONCAT(CS_CHARGE_NM,IF(CS_CHARGE_TELNO IS NULL,'',' / '),CS_CHARGE_TELNO)
+		            FROM   TB_SUPPLY_COMPANY
+		            WHERE  SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS CS_CHARGE_NM
 		      FROM TB_ORDER O
 		     INNER JOIN TB_ORDER_DETAIL OD
 		        ON O.ORD_NO = OD.ORD_NO
@@ -1741,6 +1745,7 @@
 		     , A.SUPPLY_COMP_NM
 		     , A.ORD_CHG_SQ
 		     , A.SHOT_DELV_GB
+		     , A.CS_CHARGE_NM
 		 ORDER BY A.ORD_NO
 		     , A.ORD_DTL_NO
 	</select>