From 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 16:45:27 +0800 Subject: [PATCH] Merge branch 'score_shop' 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