From 888da8f97aab268eeac73078c9eccb6056de4739 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期三, 20 八月 2025 15:52:28 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-activity/src/main/java/com/dsh/activity/entity/VipDetail.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/VipDetail.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/VipDetail.java index b7382ef..8cb389d 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/VipDetail.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/VipDetail.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 io.swagger.annotations.ApiModel; @@ -18,51 +19,77 @@ private Integer id; @ApiModelProperty(value = "用户id") + @TableField("appUserId") private Integer appUserId; @ApiModelProperty(value = "使用状态 1待使用 2已使用 3已过期") + private Integer status; @ApiModelProperty(value = "获取时间") + @TableField("insertTime") + private Date insertTime; @ApiModelProperty(value = "会员id") + @TableField("vipId") + private Integer vipId; @ApiModelProperty(value = "会员权益类型 1优惠券 2门票") private Integer type; @ApiModelProperty(value = "会员支付记录id") + @TableField("vipPaymentId") private Integer vipPaymentId; @ApiModelProperty(value = "优惠券id") + @TableField("couponId") + private Integer couponId; @ApiModelProperty(value = "门票名称") + @TableField("ticketName") + private String ticketName; @ApiModelProperty(value = "开始时间") + @TableField("startTime") + private Date startTime; @ApiModelProperty(value = "结束时间") + @TableField("endTime") + private Date endTime; @ApiModelProperty(value = "可用次数") + @TableField("useCount") + private Integer useCount; @ApiModelProperty(value = "使用门店id") + @TableField("useStoreId") + private Integer useStoreId; @ApiModelProperty(value = "使用场地id") + @TableField("useSiteId") + private Integer useSiteId; - @ApiModelProperty(value = "使用商品id") - private Integer useGoodsId; + @ApiModelProperty(value = "使用时间") + @TableField("useTime") + private Date useTime; @ApiModelProperty(value = "运营商id") + @TableField("operatorId") + private Integer operatorId; @ApiModelProperty(value = "用户优惠券id") + @TableField("userCouponId") + private Long userCouponId; } -- Gitblit v1.7.1