Merge remote-tracking branch 'origin/master'

tangzy

2021-09-15 5036e3026a69957b358da06441d2ac2da285f015

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/information/entity/Information.java

@@ -146,5 +146,15 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date ftime;

    /**
     * 经度
     */
    private String longitude;

    /**
     * 纬度
     */
    private String latitude;


}

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

@@ -121,4 +121,10 @@
    @TableField("audit_status")
    private Integer auditStatus;

    /**
     * 考试等级
     */
    @TableField("train_level")
    private String trainLevel;

}