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

src/main/resources/EPaperVerifyMapper.xml

@@ -48,7 +48,7 @@
         limit 1)ps1
         left join e_paper_student0608 ps on ps.epsid=ps1.epsid
         LEFT JOIN e_paper_student_question0608 psq ON ps.epsid=psq.epsid and psq.ctype in(1,2)
-        left JOIN e_paper_qtype_question pt ON psq.eptqid=pt.eptid
+        left JOIN e_paper_qtype_question pt ON psq.eptqid=pt.eptqid
         left join t_user u on ps.studentid=u.userid
         left join t_class c on ps.classid=c.classid
     </select>