Merge remote-tracking branch 'origin/master'

Administrator

2021-07-18 d933448be36d77173a9039fe0c8d210d4e76798c

 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;

}