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

jyy

2021-03-17 0f66a8dc0544e72b0d41adfc69db20ea584c4661

 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java

@@ -35,6 +35,8 @@
        if(shopSalesmanOrder!=null){
            shopSalesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_YTK);
            shopSalesmanOrderDao.updateById(shopSalesmanOrder);
        }else{
            LogUtil.debug("改订单为生成分销订单={}", orderId);
        }
    }