Merge branch 'ty_fix' into alpha

Helius

2021-11-12 07e532caa1008930e1e7ad238c122540620efdc9

 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;


}