From c76890a550f386a52a7111e3d87242ab35af5b41 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 28 Nov 2021 16:15:51 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanAppliingDto.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanAppliingDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanAppliingDto.java
index 11227e7..3672483 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanAppliingDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanAppliingDto.java
@@ -15,8 +15,6 @@
 	
 	@ApiModelProperty(hidden = true)
 	private Long companyId;
-	@ApiModelProperty(hidden = true)
-	private Integer applyStatus;
 
 	
 }

--
Gitblit v1.9.1