From 5857fd14f4608ace25724ba6386d72d210e20870 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 25 Mar 2021 10:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 fc2bfd5..b60f3de 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
@@ -25,6 +25,10 @@
 	 * 审核状态-3未通过
 	 */
 	public static final int APPLY_STATUS_WTG = 3;
+	/**
+	 * 审核状态-4系统删除
+	 */
+	public static final int APPLY_STATUS_XTQX = 4;
 
 
 	/**
@@ -63,6 +67,9 @@
 	@ApiModelProperty(value = "备注")
 	private String  remark;
 	
+	@ApiModelProperty(value = "等级ID")
+	private long  gradeId;
+	
 	/**
 	 * 公司ID
 	 */

--
Gitblit v1.9.1