From 2cbd12e0433dd28aa7a5a88f7c4cb8728de444f9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 七月 2025 10:49:39 +0800
Subject: [PATCH] Merge branch 'hlg' of http://120.76.84.145:10101/gitblit/r/java/gy_jifenshangcheng into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
index 418894b..1bfd56d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java
@@ -30,8 +30,8 @@
if (file.isEmpty()) {
return R.fail("请选择要上传的文件");
}
- chargeOrderService.importExpress(file);
- return R.ok();
+
+ return chargeOrderService.importExpress(file);
}
/**
--
Gitblit v1.7.1