Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	制证调度系统—测试分析报告.doc
#	制证调度系统—软件需求说明书.doc

src/main/java/com/yxproject/start/service/impl/UserInfoServiceImpl.java

@@ -70,17 +70,7 @@ public class UserInfoServiceImpl implements UserInfoService {
         sysRoleMapper.updateUserRole(userInfo.getId(),roleId);
         return true;
     }
-//
-//    @Override
-//    public int delUsername(UserInfo userInfo) {
-//        userInfoMapper.delUserInfo(userInfo.getUid());
-//        return 1;
-//    }
-//    @Override
-//    public int updateUsername(UserInfo userInfo) {
-//        userInfoMapper.updateUserInfo(userInfo);
-//        return 1;
-//    }
+
 
 
 }