Merge remote-tracking branch 'origin/master'

zengh

2021-08-13 05d218bdda3f09aa5d057fda916f5f0b668fb720

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

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


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


}