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

Helius

2021-06-23 4cb590cfe7bc615207bd7fdfcf30295a038e470e

 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