Merge remote-tracking branch 'origin/jsh77b' into xodud1202

# Conflicts:
#	src/main/java/com/style24/persistence/domain/Order.java

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

@@ -440,6 +440,7 @@ public class Order extends TscBaseDomain {
 	private int compSumPrice;		// 업체별 금액 합계
 	private int totDelvFee;			// 배송비 총합
 	private int totCartCnt;			// 장바구니 상품 수량
+	private int qtySumCurrPrice;	// 
 
 	// 다다익선
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)