Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/shop/BanLiShopGoodsSetsMapper.java

@@ -27,7 +27,8 @@
    * @param count

    * @return

    */

   List<BanLiShopGoodsSets> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key);

   List<BanLiShopGoodsSets> listQuery(@Param("start") long start, @Param("count") int count, 
         @Param("key") String key, @Param("goodsId")Long goodsId);



   /**

    * 计数

@@ -36,5 +37,5 @@
    * @param state

    * @return

    */

   long countQuery(@Param("key") String key);

   long countQuery(@Param("key") String key, @Param("goodsId")Long goodsId);

}