# Conflicts: # src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js # src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html