From 21db21a114356e0704a3483c1a3f22b96ea6658b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 07 Apr 2021 16:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
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