Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

Helius

2022-06-09 d524c2c3f60032916218a638ee5fa610cd2a330c

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

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

    /**
     * 拼团ID