From 37235c82903aaf4e7efe3096174f4a4f6430caef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 09:41:28 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
index 880312c..9e951a6 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -94,7 +95,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")
@@ -124,5 +129,8 @@
@TableField("bound_shop_superiors_points")
private Integer boundShopSuperiorsPoints;
+ @TableField(exist = false)
+ private List<GoodsArea> goodsAreaList;
+
}
--
Gitblit v1.7.1