Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

 src/main/java/com/ycl/jxkg/domain/entity/StudyRecord.java

@@ -21,4 +21,6 @@
    @TableField("last_time")
    private Date lastTime;

    @TableField("meet_count")
    private Integer meetCount;
}