Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b qa origin/qa
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff qa git push origin master
Status changed to merged
mentioned in commit ceeda120c10e70bf697e4f728fd95599985e5e02
Test See merge request !35
关于支付尾款的修改，和显示 See merge request !34
Test See merge request !33
Dev See merge request !32
Test See merge request !31
Dev See merge request !30
Test See merge request !29
购物车购买修改， 商品无库存显示，首页二维码 See merge request !28
Test See merge request !27
Dev See merge request !26
2、优惠券使用时间未到但还是能选择得到 (完成) 3、重新申请退款点击进入无法重新退款 (完成) 4、基本设置里设置的退款方式是原路返回，在商城使用微信支付， (完成) 然后申请退款，到退货单里退款的的类型却是退到用户余额。 5、订单详情页面关于退款的显示
Test See merge request !25
Dev See merge request !24
Test See merge request !23
Dev See merge request !22
Test See merge request !21
Dev See merge request !20
Dev See merge request !19
物流信息 See merge request !18
Dev See merge request !17
商品详情，拼单列表，拼团参团 See merge request !16
Dev See merge request !15
Dev See merge request !14
