Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-25 e3940d7c6d251167fd1eac3e3877c5c32153b7b0

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

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

    /**
     * 拼团ID