Merge branch 'ty_fix' into alpha

Helius

2021-11-08 c69abb780e3ccbfdbb8bd180b2fbe0df25f080f6

 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