From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 12 七月 2024 13:39:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java index 6d9d067..16e7d90 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectResponseVO.java +++ b/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; + } -- Gitblit v1.8.0