From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 07 七月 2023 18:13:14 +0800 Subject: [PATCH] 合并代码 --- cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java index 44e1908..ffd5ef3 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java +++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java @@ -1,6 +1,7 @@ package com.dsh.course.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -33,102 +34,127 @@ /** * 省 */ + @TableField("province") private String province; /** * 省编号 */ + @TableField("provinceCode") private String provinceCode; /** * 市 */ + @TableField("city") private String city; /** * 市编号 */ + @TableField("cityCode") private String cityCode; /** * 门店id */ + @TableField("storeId") private Integer storeId; /** * 课包类型id */ + @TableField("coursePackageTypeId") private Integer coursePackageTypeId; /** * 课包名称 */ + @TableField("name") private String name; /** * 上课场地id */ + @TableField("siteId") private Integer siteId; /** * 教练id */ + @TableField("coachId") private Integer coachId; /** * 最多预约人数 */ + @TableField("maxSubscribeNumber") private Integer maxSubscribeNumber; /** * 上课开始时间 */ + @TableField("classStartTime") private String classStartTime; /** * 上课结束时段 */ + @TableField("classEndTime") private String classEndTime; /** * 上课周,多个分号分隔 */ + @TableField("classWeeks") private String classWeeks; /** * 封面图 */ + @TableField("coverDrawing") private String coverDrawing; /** * 详情图 */ + @TableField("detailDrawing") private String detailDrawing; /** * 介绍图 */ + @TableField("introduceDrawing") private String introduceDrawing; /** * 排序 */ + @TableField("sort") private Integer sort; /** * 支付方式(1=现金,2=玩湃币) */ + @TableField("payType") private Integer payType; /** * 有效天数 */ + @TableField("validDays") private Integer validDays; /** * 课程状态(1=未开始,2=进行中,3=已结束,4=已取消) */ + @TableField("status") private Integer status; /** * 审核状态(1=待审核,2=已同意,3=已拒绝) */ + @TableField("auditStatus") private Integer auditStatus; /** * 审核人id */ + @TableField("auditUserId") private Integer auditUserId; /** * 审核备注 */ + @TableField("authRemark") private String authRemark; /** * 状态(1=正常,2=冻结,3=删除) */ + @TableField("state") private Integer state; /** * 添加时间 */ + @TableField("insertTime") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date insertTime; -- Gitblit v1.7.1