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/service/ChargeOrderService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java
index 6f6c6cc..cec3f87 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java
@@ -1,6 +1,8 @@
package com.ruoyi.order.service;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.model.ChargeOrder;
@@ -8,7 +10,7 @@
import org.springframework.web.multipart.MultipartFile;
public interface ChargeOrderService extends IService<ChargeOrder> {
- void importExpress(MultipartFile file);
+ R<JSONObject> importExpress(MultipartFile file);
PageInfo<ChargeOrder> getUserPointPageList(GetImportOrderDTO getImportOrderDTO);
}
--
Gitblit v1.7.1