Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java

@@ -79,4 +79,14 @@
    */

   public List<Special> listBySystemAndCard(String card, Long systemId);



   /**

    * 活动列表-分页

    * @param start

    * @param count

    * @param card

    * @param systemId

    * @return

    */

   public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId);



}