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

jyy

2021-06-19 693f6204a6db2b4b1b80b562fcc1dccc09bb26e7

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/ShopCartBillVo.java

@@ -26,6 +26,18 @@
     * 未优惠之前的总金额
     */
    private BigDecimal srcTotal = BigDecimal.ZERO;
    /**
     * 抵用积分
     */
    private BigDecimal scorePay = BigDecimal.ZERO;

    public BigDecimal getScorePay() {
        return scorePay;
    }

    public void setScorePay(BigDecimal scorePay) {
        this.scorePay = scorePay;
    }

    public BigDecimal getBillTotal() {
        return billTotal;