Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 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;