Merge remote-tracking branch 'origin/master' into ywx

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/SubjectQuestiontypeService.java

 import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
 import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
             if(hearnum!=null && hearnum >0){
                 Map tlmap = new HashMap();
                 tlmap.put("qtypename","听力题");
+                tlmap.put("qtypeid","tlt");
                 list.add(0,tlmap);
             }
         }