Merge branch 'api' into hive2.0

jyy

2021-01-25 b265b9fc41cd9de5bd36c76ec02578e1075de1d1

 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 = "本金消耗")