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

admin

2020-02-26 a276635f2b82e5ee653275024d6211f7132df9a1

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

@@ -107,7 +107,7 @@
    * @param versionCode

    * @return

    */

   public List<Special> listByVersion(long start, int count, String card, Integer platform, Integer versionCode);

   public List<Special> listByVersion(long start, int count, String card, String platform, Integer versionCode);





   /**