From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsPayMapper.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsPayMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsPayMapper.java index 6c52ed8..7730613 100644 --- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsPayMapper.java +++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsPayMapper.java @@ -33,7 +33,8 @@ * @param count * @return */ - List<BanLiShopGoodsSetsPay> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key, @Param("payType") Integer payType); + List<BanLiShopGoodsSetsPay> listQuery(@Param("start") long start, @Param("count") int count, + @Param("key") String key, @Param("payType") Integer payType, @Param("setId")Long setId); /** * 璁℃暟 @@ -42,6 +43,6 @@ * @param state * @return */ - long countQuery(@Param("key") String key, @Param("payType") Integer payType); + long countQuery(@Param("key") String key, @Param("payType") Integer payType, @Param("setId")Long setId); } \ No newline at end of file -- Gitblit v1.8.0