Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 c8daa9e8958f5dd4d2e2de5f6560f7f1e3065786

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -230,7 +230,6 @@
        if (!check){
            throw new ServiceException("订单不存在");
        }
        Integer orderType = order.getOrderType();

        // 售后设置
        R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);