Merge branch 'dev' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -293,7 +293,7 @@ public class CreatePdfUtil {
         }
         int paperRandom = new Random().nextInt(paperTypes.length);
         String paperType = paperTypes[paperRandom];
-        examTaskDetail.setPaperType(paperType);
+        examTaskDetail.setRelatePaperType(paperType);
         return paperType;
     }
 
@@ -401,6 +401,7 @@ public class CreatePdfUtil {
         //学生题卡
         BasicAttachment examStudentAttachment = basicAttachmentService.saveAttachmentHtml(examCard.getSchoolId() + "|" + examCard.getCourseCode() + "|" + t.getTicketNumber(), studentHtml, userId, examStudentPdfList);
         t.setAttachmentId(examStudentAttachment.getId());
+        t.setPaperType(paperType);
         return examStudentAttachment;
     }