From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
index ca95447..7d41aee 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
@@ -12,6 +12,14 @@
     private String totalRevenue;
 
 
+    @ApiModelProperty(value = "分销佣金")
+    private String salesRevenue;
+
+    @ApiModelProperty(value = "邀请奖励")
+    private String invitationRevenue;
+
+
+
     @ApiModelProperty(value = "待结算收益")
     private String djsRevenue;
 
@@ -19,8 +27,12 @@
     @ApiModelProperty(value = "可提现金额")
     private String  withdrawalCash;
 
+
+    @ApiModelProperty(value = "邀请订单数")
+    private String  invitationOrderCount;
+
     @ApiModelProperty(value = "推广订单数")
-    private String  orderCount;
+    private String  salesorderCount;
 
 
     @ApiModelProperty(value = "客户数")

--
Gitblit v1.9.1