From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopRevenueFlow.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 9239bfd..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
@@ -17,7 +17,15 @@
 	@Extend
 	private static final long serialVersionUID = 1L; 
 
-	
+	/**
+	 * 推广收益类型    推广收益
+	 */
+    public static final String TYPE_TGSY = "推广收益";
+    /**
+     * 推广收益类型   邀请收益
+     */
+   
+    public static final String TYPE_YQSY = "邀请收益";
 
 
 	
@@ -25,7 +33,7 @@
 	 * 用户id
 	 */
 	@ApiModelProperty(hidden = true)
-	private String  userId;
+	private Long  userId;
 	
 	/**
 	 * 收益说明

--
Gitblit v1.9.1