Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-22 bb21e20b0542a3f23a12b0811c5e242783108ee5

 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;