From f9fab7b4d668a5f77136d18f0fc7314b763206eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 16 Mar 2021 17:09:01 +0800
Subject: [PATCH] 分销订单0316

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
index cc3a7e3..3a3af3c 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanApplyVo.java
@@ -1,15 +1,13 @@
 package com.matrix.system.fenxiao.vo;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.matrix.core.anotations.Extend;
-
-import io.swagger.annotations.ApiModelProperty;
-
+@Data
 public class ShopSalesmanApplyVo {
-	@Extend
-    private static final long serialVersionUID = 1L;
 
 	/**
 	 * 审核状态-1、待审核
@@ -23,6 +21,10 @@
 	 * 审核状态-3未通过
 	 */
 	public static final int APPLY_STATUS_WTG = 3;
+	/**
+	 * 审核状态-4系统删除
+	 */
+	public static final int APPLY_STATUS_XTQX = 4;
 
 
 	/**
@@ -42,7 +44,8 @@
 	 */
 	public static  final  int APPLY_WAY_HAND_ADD=4;
 
-
+	@ApiModelProperty(value = "申请记录ID")
+	private Long id;
 
 	@ApiModelProperty(value = "申请方式1、自主申请,2、自动添加,3上级邀请,4、手动添加(来源)")
 	private Integer  applyWay;
@@ -69,6 +72,8 @@
 	
 	@ApiModelProperty(value = "分销员")
 	private String nickname;
+	@ApiModelProperty(value = "头像")
+	private String avatarUrl;
 	@ApiModelProperty(value = "邀请人")
 	private String parentUser;
 	@ApiModelProperty(value = "下级客户数")
@@ -80,6 +85,7 @@
 	private BigDecimal balance;
 	@ApiModelProperty(value = "等级")
 	private String grade;
+	
 	@ApiModelProperty(value = "加入时间")
 	private Date createTime;
 	@ApiModelProperty(value = "状态")

--
Gitblit v1.9.1