From af27c7e07d7717d25ef06d4a4ae9e56ea184116a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 14:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/service/OrderService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/OrderService.java b/src/main/java/com/zy/crm/manager/service/OrderService.java
index f85e809..3f917c9 100644
--- a/src/main/java/com/zy/crm/manager/service/OrderService.java
+++ b/src/main/java/com/zy/crm/manager/service/OrderService.java
@@ -14,7 +14,7 @@
String getUuid(Long hostId);
- Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition);
+ Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status);
Double selectMoneyByYearAndStatus(String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�讳氦鏄撻噾棰�
--
Gitblit v1.9.1