Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/com/hellogithub/dao/UserDao.java

src/com/hellogithub/service/UserService.java

@@ -56,6 +56,11 @@ public class UserService {
     public int  dedleteAllLabel(String name){return userDao.dedleteAllLabel(name);}
     public long queryUserCount(){return userDao.queryUserCount();}
 
+    /**
+     * 根据用户名返回贡献值
+     * @param name
+     * @return
+     */
     public int contributionValueReturn(String name){return userDao.contributionValueReturn(name);}
 
     public int addLabel(String username,String str){return userDao.addLabel(username,str);}