From 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
index 581f85d..5c33c96 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
@@ -21,5 +21,5 @@
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);
+ IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer type, String time);
}
--
Gitblit v1.9.3