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

admin

2020-04-01 c70caa91e6b0e1f944b148b55685aca43bb90783

 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);





   /**