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

332ee410 · 박상호 · e6a926ac · 523a4677 · 332ee410 · 332ee410
Commit 332ee410 authored Feb 01, 2021 by 박상호 🎼
--- a/data/ppt/mobile/user-payment-postcode.jpg
+++ b/data/ppt/mobile/user-payment-postcode.jpg
--- a/data/ppt/mobile/user-payment-postcode2.jpg
+++ b/data/ppt/mobile/user-payment-postcode2.jpg
--- a/data/ppt/mobile/user-payment.jpg
+++ b/data/ppt/mobile/user-payment.jpg
--- a/data/ppt/mobile/user-paymentcompleted.jpg
+++ b/data/ppt/mobile/user-paymentcompleted.jpg
--- a/data/ppt/mobile/user-paymentcompleted2.jpg
+++ b/data/ppt/mobile/user-paymentcompleted2.jpg
--- a/data/ppt/mobile/user-shoppingcart1.jpg
+++ b/data/ppt/mobile/user-shoppingcart1.jpg
--- a/data/ppt/pc/login-admin.jpg
+++ b/data/ppt/pc/login-admin.jpg
--- a/data/ppt/pc/login-user.jpg
+++ b/data/ppt/pc/login-user.jpg
--- a/data/ppt/pc/productRegist-list.jpg
+++ b/data/ppt/pc/productRegist-list.jpg
--- a/data/ppt/pc/productRegist-regist1.jpg
+++ b/data/ppt/pc/productRegist-regist1.jpg
--- a/data/ppt/pc/productRegist-regist2.jpg
+++ b/data/ppt/pc/productRegist-regist2.jpg
--- a/data/ppt/pc/signup-admin.jpg
+++ b/data/ppt/pc/signup-admin.jpg
--- a/data/ppt/pc/signup-user.jpg
+++ b/data/ppt/pc/signup-user.jpg
--- a/data/ppt/pc/user-home1.jpg
+++ b/data/ppt/pc/user-home1.jpg
--- a/data/ppt/pc/user-home2.jpg
+++ b/data/ppt/pc/user-home2.jpg
--- a/data/ppt/pc/user-mypage-orderlist.jpg
+++ b/data/ppt/pc/user-mypage-orderlist.jpg
--- a/data/ppt/pc/user-mypage-profile-edit.jpg
+++ b/data/ppt/pc/user-mypage-profile-edit.jpg
--- a/data/ppt/pc/user-mypage-profile-edit2.jpg
+++ b/data/ppt/pc/user-mypage-profile-edit2.jpg
--- a/data/ppt/pc/user-mypage-profile-edit3.jpg
+++ b/data/ppt/pc/user-mypage-profile-edit3.jpg
--- a/data/ppt/pc/user-mypage-profile.jpg
+++ b/data/ppt/pc/user-mypage-profile.jpg