Merge branch 'score_shop' into api_score_meger

jyy

2021-08-20 d5d3d4e6397f23782958748f46c389b85eaafe47

 zq-erp/src/main/java/com/matrix/system/app/vo/UserAchieveVo.java

@@ -15,13 +15,13 @@
    @ApiModelProperty(value = "用户ID")
    private Long id;

    @ApiModelProperty(value = "订单业绩")
    @ApiModelProperty(value = "现金业绩")
    private BigDecimal orderCash;

    @ApiModelProperty(value = "现金业绩")
    @ApiModelProperty(value = "划扣业绩")
    private BigDecimal cash;

    @ApiModelProperty(value = "划扣业绩")
    @ApiModelProperty(value = "业绩提成")
    private BigDecimal cardUse;

    @ApiModelProperty(value = "本金消耗")