From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java |   45 +++++++++++++++++----------------------------
 1 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
index 6b9efc1..80bb8a8 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.matrix.system.score.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -24,6 +25,10 @@
 	 * 审核状态-3未通过
 	 */
 	public static final int APPLY_STATUS_WTG = 3;
+	/**
+	 * 审核状态-4系统删除
+	 */
+	public static final int APPLY_STATUS_XTQX = 4;
 
 
 	/**
@@ -44,47 +49,31 @@
 	public static  final  int APPLY_WAY_HAND_ADD=4;
 
 
-	
-	/**
-	 * 申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加
-	 */
 
-
+	@ApiModelProperty(value = "申请方式1、自主申请，2、自动添加，3上级邀请，4、手动添加")
 	private Integer  applyWay;
+
+	@ApiModelProperty(value = "申请用户id")
+	private Long  userId;
 	
-	/**
-	 * 申请用户id
-	 */
 
-
-	private String  userId;
+	@ApiModelProperty(value = "邀请用户ID")
+	private Long  parentUserId;
 	
-	/**
-	 * 邀请用户ID
-	 */
 
-
-	private String  parentUserId;
-	
-	/**
-	 * 申请状态1、待审核，2通过，3未通过
-	 */
-
-
+	@ApiModelProperty(value = "申请状态1、待审核，2通过，3未通过")
 	private Integer  applyStatus;
-	
-	/**
-	 * 备注
-	 */
 
-
+	@ApiModelProperty(value = "备注")
 	private String  remark;
+	
+	@ApiModelProperty(value = "等级ID")
+	private long  gradeId;
 	
 	/**
 	 * 公司ID
 	 */
-
-
+	@ApiModelProperty(hidden = true)
 	private Long  companyId;
 
 

--
Gitblit v1.9.1