# Conflicts: # mall-admin/pom.xml # mall-portal/src/main/java/com/buy507/mall/portal/controller/VipCenterController.java