From d9e5ab959b7ff2c578672938c205a7a82765ef9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
similarity index 79%
rename from sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
rename to inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
index 8193cc4..581f85d 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
@@ -20,6 +20,6 @@
//鏌ヨ閿�鍞崟鍒楄〃
IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime);
-
-
+ //鏌ヨ璁㈠崟bom鍒楄〃
+ IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state, String time);
}
--
Gitblit v1.9.3