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

935090232@qq.com

2022-02-17 bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11

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

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

    /**
     * 拼团ID