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

fuliqi

2024-07-05 4e4e7828493ebfb9313ec6a3acd3b649d103d3e3

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