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

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java

@@ -141,7 +141,10 @@
     * 用户ID
     */
    private String userId;

    /**
     * 支付积分
     */
    private Integer scorePay;

    /**
     * 下单时间
@@ -336,6 +339,13 @@
        return orderNo;
    }

    public Integer getScorePay() {
        return scorePay;
    }

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

    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;