Merge remote-tracking branch 'origin/master'

zengh

2021-07-16 43d4a8434592145ae3fcfb30f332a20f057a1055

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

@@ -91,4 +91,9 @@
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private Date trainingTime;

   /**
    * 是否取消报名  1:否   2:是
    */
   private Integer cancel;

}