From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallOrderController.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallOrderController.java
index bf4f8bf..3c4366a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallOrderController.java
+++ b/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();
     }
 }

--
Gitblit v1.8.0