From 8c2a413d2574151a2bc762aa0779f766de48160b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 18:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsVip.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsVip.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsVip.java
index 99e44cb..4828120 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsVip.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsVip.java
@@ -23,7 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods_vip")
-@ApiModel(value="GoodsVip对象", description="")
+@ApiModel(value="会员价格对象", description="")
public class GoodsVip implements Serializable {
private static final long serialVersionUID = 1L;
@@ -70,7 +70,11 @@
@ApiModelProperty(value = "获取返佣积分上级类型（1=直推上级，2=直帮上级）")
@TableField("superior_type")
- private Integer superiorType;
+ private String superiorType;
+
+ @ApiModelProperty(value = "获取分佣金额上级类型（1=直推上级，2=直帮上级）")
+ @TableField("superior_price_type")
+ private String superiorPriceType;
@ApiModelProperty(value = "核销门店可获得服务费")
@TableField("servuce_shop_charges")
--
Gitblit v1.7.1