Merge branch 'feat-quiz' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -4027,7 +4027,7 @@ public class ApiController {
 					WmPlatformQuizTestResult historyResult = quizTestResults.get(0);
 
 					finalMark = historyResult.getQuizResult().getFinalMark();
-					expiryDate = historyResult.getExpiry().format(DatePattern.CHINESE_DATE_FORMATTER);
+					expiryDate = historyResult.getExpiry().format(DatePattern.NORM_DATE_FORMATTER);
 					valid = today.isAfter(historyResult.getExpiry());
 				}