Merge remote-tracking branch 'origin/master'

zengh

2021-09-10 3b1bba4cae03694d1364115b9cd539bee066ce7e

 src/main/java/org/springblade/modules/exam/entity/ExamSubjectChoices.java

@@ -114,4 +114,10 @@
   private String tenantCode;


   /**
    * 题库类型，A为简易题库，B为复杂题库，C为模拟题库
    */
   private String tktype;


}