fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit d2a46b3675d219fbfed9d78fc6fada0b424b618d 1 parent 91aa08ee

conflict

Inline Side-by-side
Showing 1 changed file with 0 additions and 5 deletions
@@ -132,11 +132,6 @@ router.get('/installment/card-detail', installment.cardDetail); // 银行å¡è¯¦æ @@ -132,11 +132,6 @@ router.get('/installment/card-detail', installment.cardDetail); // 银行å¡è¯¦æ
132 router.get('/installment/delBankCard', installment.delBankCard); // 删除绑定 132 router.get('/installment/delBankCard', installment.delBankCard); // 删除绑定
133 router.get('/installment/setMasterCard', installment.setMasterCard); // 切换主卡 133 router.get('/installment/setMasterCard', installment.setMasterCard); // 切换主卡
134 134
135 -<<<<<<< HEAD  
136 -router.get('/recommend-for-you/userCenter', recommendForYou.userCenter);// 为你优选  
137 -  
138 router.get('/address-vact', addressController.addressActVue); // 地址添加页面 135 router.get('/address-vact', addressController.addressActVue); // 地址添加页面
139 136
140 -=======  
141 ->>>>>>> master  
142 module.exports = router; 137 module.exports = router;