From be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudOrderService.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudOrderService.java
index 27d7ded..ac2537b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/cloud/UserCloudOrderService.java
@@ -70,4 +70,16 @@
 	 */
 	public List<UserCloudOrder> getLasthourByUnpaid();
 
+	/**
+	 * 鏌ヨ
+	 * @param page
+	 * @param count
+	 * @param key
+	 * @param state
+	 * @return
+	 */
+	public List<UserCloudOrder> query(int page, int count, String key, Integer state);
+
+	long count(String key, Integer state);
+
 }

--
Gitblit v1.8.0