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

sstudy/src/main/resources/mapper/paperstudent/PaperStudedntScantronMapper.xml

     <resultMap id="questionResult" type="java.util.Map">
         <result property="qscore" column="qscore"></result>
         <result property="qorder" column="qorder"></result>
+        <result property="qn" column="qn"></result>
         <collection property="students" ofType="java.util.Map" javaType="java.util.List">
             <result property="stuscore" column="stuscore"></result>
             <result property="answered" column="answered"></result>
         </collection>
     </resultMap>
     <select id="sqcorrectList" resultMap="questionResult">
-        select pss.qscore,pss.qorder,pss.stuscore,pss.answered,pss.checked,pss.checkcomm,pss.psid,pss.pssid
+        select pss.qscore,pss.qn,pss.qorder,pss.stuscore,pss.answered,pss.checked,pss.checkcomm,pss.psid,pss.pssid
         ,pss.answertype,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,u.username,ps1.psstate
         from t_paper_student_scantron pss left join t_paper_scantron ps on pss.pscaid = ps.pscaid
         left join t_user u on pss.studentid = u.userid