....

src/main/java/cn/com/qmth/examcloud/question/core/paper/DefaultPaper.java

@@ -16,15 +16,14 @@ public class DefaultPaper implements Paper {
 	/**
 	 * 分组集合
 	 */
-	private List<QuestionGroup> questionGroupList;
+	private List<DefaultQuestionGroup> questionGroupList;
 
 	@Override
-	public List<QuestionGroup> getQuestionGroupList() {
+	public List<? extends QuestionGroup> getQuestionGroupList() {
 		return questionGroupList;
 	}
 
-	@Override
-	public void setQuestionGroupList(List<QuestionGroup> questionGroupList) {
+	public void setQuestionGroupList(List<DefaultQuestionGroup> questionGroupList) {
 		this.questionGroupList = questionGroupList;
 	}
 

src/main/java/cn/com/qmth/examcloud/question/core/paper/DefaultQuestionGroup.java

@@ -21,7 +21,7 @@ public class DefaultQuestionGroup implements QuestionGroup {
 	/**
 	 * 题包装器集合
 	 */
-	private List<QuestionWrapper> QuestionWrapperList;
+	private List<DefaultQuestionWrapper> QuestionWrapperList;
 
 	/**
 	 * 题组总分
@@ -39,12 +39,11 @@ public class DefaultQuestionGroup implements QuestionGroup {
 	}
 
 	@Override
-	public List<QuestionWrapper> getQuestionWrapperList() {
+	public List<? extends QuestionWrapper> getQuestionWrapperList() {
 		return QuestionWrapperList;
 	}
 
-	@Override
-	public void setQuestionWrapperList(List<QuestionWrapper> questionWrapperList) {
+	public void setQuestionWrapperList(List<DefaultQuestionWrapper> questionWrapperList) {
 		QuestionWrapperList = questionWrapperList;
 	}
 

src/main/java/cn/com/qmth/examcloud/question/core/paper/Paper.java

@@ -18,14 +18,6 @@ public interface Paper extends Serializable {
 	 * @author WANGWEI
 	 * @return
 	 */
-	public List<QuestionGroup> getQuestionGroupList();
-
-	/**
-	 * 设置题组集合
-	 *
-	 * @author WANGWEI
-	 * @param questionGroupList
-	 */
-	public void setQuestionGroupList(List<QuestionGroup> questionGroupList);
+	public List<? extends QuestionGroup> getQuestionGroupList();
 
 }

src/main/java/cn/com/qmth/examcloud/question/core/paper/QuestionGroup.java

@@ -34,15 +34,7 @@ public interface QuestionGroup extends Serializable {
 	 * @author WANGWEI
 	 * @return
 	 */
-	public List<QuestionWrapper> getQuestionWrapperList();
-
-	/**
-	 * 设置题包装器集合
-	 *
-	 * @author WANGWEI
-	 * @param questionWrapperList
-	 */
-	public void setQuestionWrapperList(List<QuestionWrapper> questionWrapperList);
+	public List<? extends QuestionWrapper> getQuestionWrapperList();
 
 	/**
 	 * 获取题组总分

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestion.java

@@ -21,12 +21,12 @@ public class DefaultQuestion implements Question {
 	/**
 	 * 主版本
 	 */
-	private QuestionStructure masterVersion;
+	private DefaultQuestionStructure masterVersion;
 
 	/**
 	 * 分支版本
 	 */
-	private List<QuestionStructure> branchVersionList;
+	private List<DefaultQuestionStructure> branchVersionList;
 
 	@Override
 	public String getId() {
@@ -43,18 +43,16 @@ public class DefaultQuestion implements Question {
 		return masterVersion;
 	}
 
-	@Override
-	public void setMasterVersion(QuestionStructure masterVersion) {
+	public void setMasterVersion(DefaultQuestionStructure masterVersion) {
 		this.masterVersion = masterVersion;
 	}
 
 	@Override
-	public List<QuestionStructure> getBranchVersionList() {
+	public List<? extends QuestionStructure> getBranchVersionList() {
 		return branchVersionList;
 	}
 
-	@Override
-	public void setBranchVersionList(List<QuestionStructure> branchVersionList) {
+	public void setBranchVersionList(List<DefaultQuestionStructure> branchVersionList) {
 		this.branchVersionList = branchVersionList;
 	}
 

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestionStructure.java

@@ -26,7 +26,7 @@ public class DefaultQuestionStructure implements QuestionStructure {
 	/**
 	 * 体单元集合
 	 */
-	private List<QuestionUnit> questionUnitList;
+	private List<DefaultQuestionUnit> questionUnitList;
 
 	@Override
 
@@ -50,12 +50,11 @@ public class DefaultQuestionStructure implements QuestionStructure {
 	}
 
 	@Override
-	public List<QuestionUnit> getQuestionUnitList() {
+	public List<? extends QuestionUnit> getQuestionUnitList() {
 		return questionUnitList;
 	}
 
-	@Override
-	public void setQuestionUnitList(List<QuestionUnit> questionUnitList) {
+	public void setQuestionUnitList(List<DefaultQuestionUnit> questionUnitList) {
 		this.questionUnitList = questionUnitList;
 	}
 

src/main/java/cn/com/qmth/examcloud/question/core/question/DefaultQuestionUnit.java

@@ -26,7 +26,7 @@ public class DefaultQuestionUnit implements QuestionUnit {
 	/**
 	 * 选项集合
 	 */
-	private List<QuestionOption> questionOptionList;
+	private List<DefaultQuestionOption> questionOptionList;
 
 	/**
 	 * 正确答案
@@ -54,12 +54,11 @@ public class DefaultQuestionUnit implements QuestionUnit {
 	}
 
 	@Override
-	public List<QuestionOption> getQuestionOptionList() {
+	public List<? extends QuestionOption> getQuestionOptionList() {
 		return questionOptionList;
 	}
 
-	@Override
-	public void setQuestionOptionList(List<QuestionOption> questionOptionList) {
+	public void setQuestionOptionList(List<DefaultQuestionOption> questionOptionList) {
 		this.questionOptionList = questionOptionList;
 	}
 

src/main/java/cn/com/qmth/examcloud/question/core/question/Question.java

@@ -36,28 +36,12 @@ public interface Question extends Serializable {
 	 */
 	public QuestionStructure getMasterVersion();
 
-	/**
-	 * 设置主版本
-	 *
-	 * @author WANGWEI
-	 * @param masterVersion
-	 */
-	public void setMasterVersion(QuestionStructure masterVersion);
-
 	/**
 	 * 获取分支
 	 *
 	 * @author WANGWEI
 	 * @return
 	 */
-	public List<QuestionStructure> getBranchVersionList();
-
-	/**
-	 * 设置分支
-	 *
-	 * @author WANGWEI
-	 * @param branchVersionList
-	 */
-	public void setBranchVersionList(List<QuestionStructure> branchVersionList);
+	public List<? extends QuestionStructure> getBranchVersionList();
 
 }

src/main/java/cn/com/qmth/examcloud/question/core/question/QuestionStructure.java

@@ -50,14 +50,6 @@ public interface QuestionStructure extends Serializable {
 	 * @author WANGWEI
 	 * @return
 	 */
-	public List<QuestionUnit> getQuestionUnitList();
-
-	/**
-	 * 设置题单元集
-	 *
-	 * @author WANGWEI
-	 * @param questionUnitList
-	 */
-	public void setQuestionUnitList(List<QuestionUnit> questionUnitList);
+	public List<? extends QuestionUnit> getQuestionUnitList();
 
 }

src/main/java/cn/com/qmth/examcloud/question/core/question/QuestionUnit.java

@@ -50,15 +50,7 @@ public interface QuestionUnit extends Serializable {
 	 * @author WANGWEI
 	 * @return
 	 */
-	public List<QuestionOption> getQuestionOptionList();
-
-	/**
-	 * 设置选项集
-	 *
-	 * @author WANGWEI
-	 * @param questionOptionList
-	 */
-	public void setQuestionOptionList(List<QuestionOption> questionOptionList);
+	public List<? extends QuestionOption> getQuestionOptionList();
 
 	/**
 	 * 获取正确答案