From 2e53c542b4dfac6d1e62c7a2e7d21a3984e797c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 十一月 2019 17:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopOrderMapper.java | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopOrderMapper.java
index 8426bb2..603a5f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopOrderMapper.java
@@ -1,43 +1,43 @@
-package com.yeshi.fanli.dao.mybatis.shop;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.shop.BanLiShopOrder;
-
-public interface BanLiShopOrderMapper extends BaseMapper<BanLiShopOrder> {
-
- BanLiShopOrder selectByPrimaryKeyForUpdate(Long id);
-
- /**
- * 鏍规嵁鐢ㄦ埛ID妫�绱�
- *
- * @param stateList
- * @param uid
- * @param start
- * @param count
- * @return
- */
- List<BanLiShopOrder> listByUidAndState(@Param("stateList") List<Integer> stateList, @Param("uid") Long uid,
- @Param("start") long start, @Param("count") int count);
-
- /**
- * 鏍规嵁鐢ㄦ埛ID璁℃暟
- *
- * @param stateList
- * @param uid
- * @return
- */
- long countByUidAndState(@Param("stateList") List<Integer> stateList, @Param("uid") Long uid);
-
- /**
- * 鏍规嵁璁㈠崟鍙锋煡璇�
- *
- * @param orderNo
- * @return
- */
- BanLiShopOrder selectByOrderNo(String orderNo);
-
+package com.yeshi.fanli.dao.mybatis.shop;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.shop.BanLiShopOrder;
+
+public interface BanLiShopOrderMapper extends BaseMapper<BanLiShopOrder> {
+
+ BanLiShopOrder selectByPrimaryKeyForUpdate(Long id);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID妫�绱�
+ *
+ * @param stateList
+ * @param uid
+ * @param start
+ * @param count
+ * @return
+ */
+ List<BanLiShopOrder> listByUidAndState(@Param("stateList") List<Integer> stateList, @Param("uid") Long uid,
+ @Param("start") long start, @Param("count") int count);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID璁℃暟
+ *
+ * @param stateList
+ * @param uid
+ * @return
+ */
+ long countByUidAndState(@Param("stateList") List<Integer> stateList, @Param("uid") Long uid);
+
+ /**
+ * 鏍规嵁璁㈠崟鍙锋煡璇�
+ *
+ * @param orderNo
+ * @return
+ */
+ BanLiShopOrder selectByOrderNo(String orderNo);
+
}
\ No newline at end of file
--
Gitblit v1.8.0