Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

wzy

2021-11-20 2a7a159b136805612e241e4e8e24affedfc23cc2

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

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

    /**
     * 拼团ID