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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialCardMapper.java

@@ -13,9 +13,10 @@
   int deleteBatchByPrimaryKey(List<Long> list);

   

   

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

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

   

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

   long countlistQuery(@Param("key") String key, @Param("listPid")List<Long> listPid);

   

   

   String getbottomPicture(@Param("placeKey") String placeKey);