Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-07 894cde4d057b5805177a8af046a97580030de066

 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;


}