Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 94ae02e6f73b7011f0fcf6acff8636341d35351d

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -381,7 +381,7 @@

        Order orderData = orderClient.detail(order.getOrderId()).getData();

        if(orderData.getState()==0 && (!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId()))){
        if(!order.getTime().equals(orderData.getTime()) || !order.getServerId().equals(orderData.getServerId())){
            // 修改sys_change_dispatch 为已改派
            dispatchClient.changeReason(order.getOrderId(),"");
        }