Merge branch 'ty_fix' into score_shop

Helius

2021-11-30 ba7ef6a2cfeff873da48469cc775c5f928ea45e8

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

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

    /**
     * 拼团ID