From d4c997972509c2da06b1128086b1735597823d3f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:20 +0800
Subject: [PATCH] Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix

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

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
index fd8d9b2..2a2130b 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java
@@ -33,7 +33,7 @@
 	 * 用户id
 	 */
 	@ApiModelProperty(hidden = true)
-	private String  userId;
+	private Long  userId;
 	
 	/**
 	 * 收益说明

--
Gitblit v1.9.1