From 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 19 Jun 2021 14:45:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/RevenueFlowDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/RevenueFlowDto.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/RevenueFlowDto.java
index 6d81221..7b21018 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/RevenueFlowDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/RevenueFlowDto.java
@@ -20,7 +20,7 @@
     private Integer  revenueType;
 
     @ApiModelProperty(hidden = true)
-    private String  userId;
+    private Long  userId;
 
 
 }

--
Gitblit v1.9.1