Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

16 小时以前 c5d38d650d2ac4101b1293a4f17346e7d5420076

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -56,7 +57,7 @@
    private String[] shopSalesRankKey;

    @ApiModelProperty(value = "合作商营业额value")
    private Integer[] shopSalesRankValue;
    private BigDecimal[] shopSalesRankValue;

    @ApiModelProperty(value = "合作商推荐")
    private List<MgtMapIntTotalVo> shopRecommendVos;