From 8a57b3a0ee3fa70e8d43eb12865f1c27d0d385d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 14:55:58 +0800
Subject: [PATCH] Merge branch 'div-1' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index 47518db..cdc4cc5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -369,5 +369,15 @@
 	 * @return
 	 */
 	long countSearchOrderByUid(@Param("uid") Long uid, @Param("list")List<ESOrder> list);
+	
+	
+	
+	/**
+	 * 鏌ヨ鏈�灏忕粨绠楁椂闂�
+	 * @return
+	 */
+	List<CommonOrder> getMinSettleTimeAndUid();
+	
+	
 
 }
\ No newline at end of file

--
Gitblit v1.8.0