Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 c70945a73ffa521339a4fe4f43e308cae2fb63b8

 src/main/java/com/ycl/jxkg/domain/vo/admin/education/EducationResourceVO.java

@@ -15,9 +15,9 @@
 */
@Data
public class EducationResourceVO {

    /** 当前页大小 */
    private Integer pageSize = 10;

    /** 当前页 */
    private Integer pageNum = 1;

    private Integer id;