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

jyy

2021-04-07 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad

 zq-erp/src/main/java/com/matrix/system/hive/statistics/DailySaleVo.java

@@ -18,6 +18,8 @@

    private String shopName;

    private BigDecimal shouldPay;

    private BigDecimal totalPay;

    private BigDecimal cashPay;
@@ -100,6 +102,14 @@

    private Long shopId;

    public BigDecimal getShouldPay() {
        return shouldPay;
    }

    public void setShouldPay(BigDecimal shouldPay) {
        this.shouldPay = shouldPay;
    }

    public BigDecimal getWechat() {
        return wechat;
    }