From 2dff570ccfa532f8c012bc13829b302dd3e1b9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 29 十二月 2018 15:39:29 +0800
Subject: [PATCH] Merge branch 'master' into div1
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 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 a7d1084..e533fe9 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
@@ -63,7 +63,7 @@
*/
Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("day") Integer day);
/**
* 濂栭噾璁㈠崟鏁伴噺
--
Gitblit v1.8.0