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/ShopSalesmanOrder.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
index 761dd2a..1e19521 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
@@ -55,14 +55,14 @@
 	 */
 
 
-	private String  userId;
+	private Long  userId;
 	
 	/**
 	 * 收益人id
 	 */
 
 
-	private String  salesUserId;
+	private Long  salesUserId;
 	
 	/**
 	 * 收益类型1，推广收益，2邀请收益

--
Gitblit v1.9.1