From 3805534a85a9f9389dce859818b75b0f1059ee44 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 15 八月 2024 20:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 bad9133..a7a6a22 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
@@ -134,6 +134,12 @@
@ApiModelProperty(value = "商城专享价开关（0=否，1=是）")
@TableField("mall_exclusive_price")
private Integer mallExclusivePrice;
+ @ApiModelProperty(value = "内部会员折扣")
+ @TableField("discount")
+ private BigDecimal discount;
+ @ApiModelProperty(value = "会员类型 1常规 2内部")
+ @TableField("type")
+ private Integer type;
--
Gitblit v1.7.1