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

yujian

2020-04-14 c04a59775ee986f33fe19e21ae02cff9f6b002a7

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





   /**