From a78ac968018e42634cfb37a6a1ef3aa2dd10acc9 Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期四, 03 四月 2025 15:20:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/java/com/dsh/course/feignClient/course/model/TCoursePackage.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/model/TCoursePackage.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/model/TCoursePackage.java index 3e75872..4cc2f53 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/model/TCoursePackage.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/model/TCoursePackage.java @@ -63,6 +63,9 @@ * 最多预约人数 */ private Integer maxSubscribeNumber; + + private Integer codeTime; + /** * 上课开始时间 */ @@ -125,4 +128,16 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date insertTime; + + private Integer type; + private String holitime; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date startTime; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + + private Date endTime; + /** + * 扣除课时数 + */ + private Integer needNum; } -- Gitblit v1.7.1