Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallOrderController.java

@@ -135,10 +135,6 @@
        // 设置订单已取消状态
        order.setOrderStatus(OrderUtil.STATUS_ADMIN_CANCEL.longValue());
        order.setCloseTime(new Date());

        //todo 退款


        return AjaxResult.success();
    }
}