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-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java index 3ba4756..f8804a8 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/IntroduceRewards.java @@ -1,6 +1,7 @@ package com.dsh.activity.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.baomidou.mybatisplus.extension.activerecord.Model; @@ -35,38 +36,47 @@ /** * 省 */ + @TableField("province") private String province; /** * 省编号 */ + @TableField("provinceCode") private String provinceCode; /** * 市 */ + @TableField("city") private String city; /** * 市编号 */ + @TableField("cityCode") private String cityCode; /** * 开始时间 */ + @TableField("startTime") private Date startTime; /** * 结束时间 */ + @TableField("endTime") private Date endTime; /** * 赠送课时 */ + @TableField("giveClass") private Integer giveClass; /** * 状态(1=正常,2=冻结,3=删除) */ + @TableField("state") private Integer state; /** * 添加时间 */ + @TableField("insertTime") private Date insertTime; -- Gitblit v1.7.1