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

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -542,6 +542,14 @@ public class EPaperQtypeService {
                         }
                     }
                 }
+            }else{
+                for(Map qtm : qtypes) {
+                    List<Map> qlist = (List<Map>) qtm.get("questions");
+                    for(Map qm : qlist){
+                        Integer ctype = Integer.parseInt(qm.get("qctype").toString());
+                        qm.put("ctype",ctype);
+                    }
+                }
             }
         }