<<<<<<< HEAD activeProfiles= eclipse.preferences.version=1 resolveWorkspaceProjects=true version=1 ======= activeProfiles= eclipse.preferences.version=1 resolveWorkspaceProjects=true version=1 >>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git