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

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

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

@@ -1,5 +1,6 @@
package com.ycl.jxkg.domain.vo.admin.education;

import com.ycl.jxkg.enums.general.StatusEnum;
import lombok.Data;


@@ -10,8 +11,11 @@

    private String name;

    private Integer level;
    private Integer itemOrder;

    private String levelName;
    private StatusEnum status;

    private String createTime;


}