From effd505edb4985b5f22de82c6c92e24e102ac778 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 11:44:20 +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/vo/ShopSalesmanApplyVo.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 6ea6b37..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
@@ -21,6 +21,10 @@
 	 * 审核状态-3未通过
 	 */
 	public static final int APPLY_STATUS_WTG = 3;
+	/**
+	 * 审核状态-4系统删除
+	 */
+	public static final int APPLY_STATUS_XTQX = 4;
 
 
 	/**
@@ -40,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;

--
Gitblit v1.9.1