From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

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

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java
index 5f11a89..c2ebdf0 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanAppliingVo.java
@@ -14,8 +14,6 @@
 	@ApiModelProperty(value = "申请用户id")
 	private String  userId;
 
-	@ApiModelProperty(value = "申请用户openId")
-	private String  openId;
 	
 	@ApiModelProperty(value = "分销员")
 	private String nickname;

--
Gitblit v1.9.1