java/mx_charging_pile.git

			@@ -3,14 +3,17 @@
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			import lombok.EqualsAndHashCode;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.io.Serializable;
			import java.math.BigDecimal;
			import java.time.LocalDateTime;
			import java.util.List;

			/**
			* <p>
			@@ -55,25 +58,47 @@
			@TableField("vip_id")
			private Integer vipId;

			@ApiModelProperty(value = "1月卡2季卡3年卡4集团")
			@TableField("vip_type")
			private Integer vipType;

			@ApiModelProperty(value = "会员开始时间")
			@TableField("start_time")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime startTime;

			@ApiModelProperty(value = "会员结束时间")
			@TableField("end_time")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime endTime;

			@TableField("create_time")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime createTime;

			@ApiModelProperty(value = "已赠送的月份")
			@TableField("send_month")
			private Integer sendMonth;
			/**
			* 本月会员优惠到期时间
			*/
			@TableField("month_end_time")
			private LocalDateTime monthEndTime;


			@ApiModelProperty(value = "当时购买的vipJson")
			@TableField("vip_json")
			private String vipJson;
			@ApiModelProperty(value = "要赠送的优惠卷")
			@TableField("coupon_ids")
			private String couponIds;
			@TableField(exist = false)
			private String vipName;
			@TableField(exist = false)
			private Integer type;

			@TableField(exist = false)
			private TVip vip;



			}