Merge remote-tracking branch 'origin/jc' into jc

guoshilong

2023-12-04 f6fad9857bddebb5bfaad2074e4be73b9b5abc62

 src/main/java/org/springblade/modules/simulateexam/vo/SimulateExamRecordVO.java

@@ -17,4 +17,11 @@
    * 1: 继续考试  2: 放弃之前的考试,重新生成题目考试
    */
   private Integer type;

   private String deptId;

   private String userName;

   private String userDeptName;

}