Merge branch 'score_shop' into api_score_meger

Helius

2022-02-14 f2d46a8884e5abfb5635313394083be7afac58a4

 zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java

@@ -40,7 +40,7 @@
    /**
     * 配送方式
     */
    private String shippingMethod;
    private Integer shippingMethod;

    /**
     * 拼团ID