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/entity/ShopSalesmanApply.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 b60f3de..80bb8a8 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
@@ -54,11 +54,11 @@
 	private Integer  applyWay;
 
 	@ApiModelProperty(value = "申请用户id")
-	private String  userId;
+	private Long  userId;
 	
 
 	@ApiModelProperty(value = "邀请用户ID")
-	private String  parentUserId;
+	private Long  parentUserId;
 	
 
 	@ApiModelProperty(value = "申请状态1、待审核，2通过，3未通过")

--
Gitblit v1.9.1