From 6926c5a086d1da028a041753bfe4dcaf623c41e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 10 八月 2024 13:46:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 379e58c..f25f364 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.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_vip")
@ApiModel(value="TVip对象", description="")
-public class TVip implements Serializable {
+public class TVip extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -33,7 +34,7 @@
@TableField("name")
private String name;
- @ApiModelProperty(value = "是否显示（0=否，1=是）")
+ @ApiModelProperty(value = "前端是否显示（0=否，1=是）")
@TableField("reveal")
private Integer reveal;
@@ -121,7 +122,7 @@
@TableField("deduction_type")
private Integer deductionType;
- @ApiModelProperty(value = "优惠券[{"id":1,"number":1}]")
+ @ApiModelProperty(value = "优惠券[{\"id\":1,\"number\":1}]")
@TableField("coupon")
private String coupon;
@@ -133,14 +134,7 @@
@TableField("mall_exclusive_price")
private Integer mallExclusivePrice;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
--
Gitblit v1.7.1