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

935090232@qq.com

2021-11-21 b4fa5c2efd4f78f2623f4302509b12c98a73b339

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java

@@ -22,7 +22,7 @@
    /**
     *  配送方式（1=物流，2=门店自取）
     */
    private String deliverySelect;
    private Integer deliverySelect;

    /**
     *  配送门店ID