Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java

@@ -59,7 +59,7 @@
   private String weight;

   /**
    * 培训报名申请id
    * 考试id
    */
   @TableField("train_exam_id")
   private String trainExamId;