From e9085eb620dcae1ceae24bc8b70e1a6bca228b15 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 19:58:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/model/CoursePackage.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/model/CoursePackage.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/model/CoursePackage.java
index a920775..cb1398b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/model/CoursePackage.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/model/CoursePackage.java
@@ -1,5 +1,6 @@
package com.dsh.activity.feignclient.course.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -52,6 +53,8 @@
* 最多预约人数
*/
private Integer maxSubscribeNumber;
+
+ private Integer codeTime;
/**
* 上课开始时间
*/
@@ -81,25 +84,13 @@
*/
private Integer sort;
/**
- * 支付方式（1=微信，2=支付宝，3=玩湃币,4=积分，5=积分+微信，6=积分+支付宝）
+ * 支付方式（1=现金，2=玩湃币）
*/
private Integer payType;
/**
* 有效天数
*/
private Integer validDays;
- /**
- * 课后练习课程id
- */
- private Integer courseId;
- /**
- * 课后练习视频介绍
- */
- private String introduce;
- /**
- * 完成课后练习获取积分
- */
- private Integer integral;
/**
* 课程状态（1=未开始，2=进行中，3=已结束，4=已取消）
*/
@@ -125,4 +116,12 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
+ private Integer type;
+ private Integer needNum;
+
+ @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;
}
--
Gitblit v1.7.1