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

姜友瑶

2022-05-17 e11162164d7b136e9de4c4b2e378b108cd87859f

 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;


}