From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
index a7a6a22..93d41af 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -53,10 +54,12 @@
@ApiModelProperty(value = "月卡折扣开始时间")
@TableField("monthly_card_discount_start")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime monthlyCardDiscountStart;
@ApiModelProperty(value = "月卡折扣结束时间")
@TableField("monthly_card_discount_end")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime monthlyCardDiscountEnd;
@ApiModelProperty(value = "月卡折扣显示（0=否，1=是）")
@@ -77,10 +80,12 @@
@ApiModelProperty(value = "季卡折扣开始时间")
@TableField("season_card_discount_start")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime seasonCardDiscountStart;
@ApiModelProperty(value = "季卡折扣结束时间")
@TableField("season_card_discount_end")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime seasonCardDiscountEnd;
@ApiModelProperty(value = "季卡折扣显示（0=否，1=是）")
@@ -101,10 +106,12 @@
@ApiModelProperty(value = "年卡折扣开始时间")
@TableField("annual_card_discount_start")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime annualCardDiscountStart;
@ApiModelProperty(value = "年卡折扣结束时间")
@TableField("annual_card_discount_end")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime annualCardDiscountEnd;
@ApiModelProperty(value = "年卡折扣显示（0=否，1=是）")
@@ -137,11 +144,13 @@
@ApiModelProperty(value = "内部会员折扣")
@TableField("discount")
private BigDecimal discount;
- @ApiModelProperty(value = "会员类型 1常规 2内部")
+ @ApiModelProperty(value = "添加的会员类型 1常规 2内部")
@TableField("type")
private Integer type;
-
+ @ApiModelProperty(value = "优惠券名称和张数 后台列表展示使用")
+ @TableField(exist = false)
+ private String couponName;
}
--
Gitblit v1.7.1