From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/service/OpenService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index ee99b30..46235b3 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.R;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
@@ -52,5 +53,5 @@
int pakinReportErp(JSONObject jsonObject) throws ParseException;
- List<String> selectOrderInformation(Map<String, String> param);
+ List<Order> selectOrderInformation(Map<String, String> param);
}
--
Gitblit v1.9.1