Merge branch 'developer'

姜友瑶

2022-05-30 d7b7ccaac1d84ecd1934eab97c0fef57bd2a847d

 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;


}