From 789c5301ba9c69f779cb0b29f22857299760a960 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 15 Mar 2021 15:51:23 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp 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