-
# Conflicts: # src/app.js # src/pages/order/orderConfirm/orderConfirm.js # src/pages/orderDetail/index.js # src/pages/orderList/index.js
# Conflicts: # src/app.js # src/pages/order/orderConfirm/orderConfirm.js # src/pages/orderDetail/index.js # src/pages/orderList/index.js