From 2a671d23fa0e5c979a8b6459b4914481cd10c353 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 七月 2019 17:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java
index 98f2118..7d97221 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java
@@ -16,9 +16,6 @@
Order selectByPrimaryKey(Long id);
- // 鏍规嵁璁㈠崟鍙锋煡鎵捐鍗�
- Order selectOrderByOrderId(String orderId);
-
/**
* 鏍规嵁璁㈠崟鍙峰拰璁㈠崟绫诲瀷鏌ユ壘璁㈠崟
*
@@ -26,7 +23,7 @@
* @param orderType
* @return
*/
- List<Order> selectOrderByOrderIdAndOrderType(@Param("orderId") String orderId, @Param("orderType") int orderType);
+ Order selectOrderByOrderIdAndOrderType(@Param("orderId") String orderId, @Param("orderType") int orderType);
List<Order> selectByUid(Long uid);
--
Gitblit v1.8.0