Merge branch 'score_shop' into api_score_meger

jyy

2021-07-15 a43e210f39562bbbdc25f75ec3aaad94ae33dfbf

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreFlowDto.java

@@ -30,8 +30,6 @@
    @ApiModelProperty(value = "收支类型 不传全部，1，收入，2支出", example = "1")
    private Integer  revenueType;

    @ApiModelProperty(hidden = true)
    private String  userId;

    @ApiModelProperty(value = "会员id", example = "1")
    private Long  vipId;