Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-07 64a1ca289eda4deb422549311c4539b09fd30ba3

 fanli/src/main/java/com/yeshi/fanli/service/inter/shop/BanLiShopGoodsSetPayService.java

@@ -65,4 +65,16 @@
    */

   public void deleteByPrimaryKey(Long id);



   /**

    * 查询表

    * @param page

    * @param pageSize

    * @param key

    * @param payType

    * @return

    */

   public List<BanLiShopGoodsSetsPay> listQuery(int page, int pageSize, String key, Integer payType);



   public long countQuery(String key, Integer payType);



}