From bb5be7a8a6ac24fbf66f03f070751577b87c95ca Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 15 Apr 2021 17:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java
index f113f4f..39387a6 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanApplyDto.java
@@ -12,6 +12,11 @@
 	
 	@ApiModelProperty(value ="审核状态")
     private Integer shenheState;
+	@ApiModelProperty(value ="分销员等级")
+	private Long salemanGrade;
+	@ApiModelProperty(value ="会员姓名")
+	private String userName;
+
 	
 	@ApiModelProperty(hidden = true)
 	private Long companyId;

--
Gitblit v1.9.1