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

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

 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;
}