Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-11-21 b4fa5c2efd4f78f2623f4302509b12c98a73b339

 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;


}