Merge branch 'developer'

Helius

2022-03-14 7940cb1960203e4407968e6f6d8b720dafcc5397

 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;


}