Merge remote-tracking branch 'origin/jiwon' into sangho

332ee410 · 박상호 · e6a926ac · 523a4677 · 332ee410 · 332ee410
Commit 332ee410 authored Feb 01, 2021 by 박상호 🎼
--- a/data/ppt/pc/user-mypage.jpg
+++ b/data/ppt/pc/user-mypage.jpg
--- a/data/ppt/pc/user-outer-product-cart.jpg
+++ b/data/ppt/pc/user-outer-product-cart.jpg
--- a/data/ppt/pc/user-outer-product-description.jpg
+++ b/data/ppt/pc/user-outer-product-description.jpg
--- a/data/ppt/pc/user-outer-product-detailimage.jpg
+++ b/data/ppt/pc/user-outer-product-detailimage.jpg
--- a/data/ppt/pc/user-outer-product-option.jpg
+++ b/data/ppt/pc/user-outer-product-option.jpg
--- a/data/ppt/pc/user-outer-product-recommend.jpg
+++ b/data/ppt/pc/user-outer-product-recommend.jpg
--- a/data/ppt/pc/user-outerList-cardigan.jpg
+++ b/data/ppt/pc/user-outerList-cardigan.jpg
--- a/data/ppt/pc/user-outerList-pagination.jpg
+++ b/data/ppt/pc/user-outerList-pagination.jpg
--- a/data/ppt/pc/user-outerList.jpg
+++ b/data/ppt/pc/user-outerList.jpg
--- a/data/ppt/pc/user-payment-kakaopay1.jpg
+++ b/data/ppt/pc/user-payment-kakaopay1.jpg
--- a/data/ppt/pc/user-payment-kakaopay2.jpg
+++ b/data/ppt/pc/user-payment-kakaopay2.jpg
--- a/data/ppt/pc/user-payment-kakaopay3.jpg
+++ b/data/ppt/pc/user-payment-kakaopay3.jpg
--- a/data/ppt/pc/user-payment-kakaopay4.jpg
+++ b/data/ppt/pc/user-payment-kakaopay4.jpg
--- a/data/ppt/pc/user-payment-postcode.jpg
+++ b/data/ppt/pc/user-payment-postcode.jpg
--- a/data/ppt/pc/user-payment-postcode2.jpg
+++ b/data/ppt/pc/user-payment-postcode2.jpg
--- a/data/ppt/pc/user-payment.jpg
+++ b/data/ppt/pc/user-payment.jpg
--- a/data/ppt/pc/user-paymentcompleted.jpg
+++ b/data/ppt/pc/user-paymentcompleted.jpg
--- a/data/ppt/pc/user-paymentcompleted2.jpg
+++ b/data/ppt/pc/user-paymentcompleted2.jpg
--- a/data/ppt/pc/user-shoppingcart1.jpg
+++ b/data/ppt/pc/user-shoppingcart1.jpg
--- a/server/controllers/kakaopay.controller.js
+++ b/server/controllers/kakaopay.controller.js