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

xiaoyong931011

2021-04-13 9fb0b7d623078e90747ac4a64283f29d4b4d51d6

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java

@@ -23,7 +23,7 @@
     * @return
     * @throws Exception
     */
    AjaxResult createShopOrder(ShopOrderDto shopOrderDto) throws Exception;
    ShopOrder createShopOrder(ShopOrderDto shopOrderDto) throws Exception;

    /**
     * 订单结算