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

admin

2019-12-16 54402107ca335c2896fc9c61864f6054ad5bfabb

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

@@ -45,6 +45,6 @@
    * @param appVersionId

    * @return

    */

   public List<Long> filterSourceIdByVersion(List<Long> sourceIdList, AdActivityType type, Long appVersionId);

   public List<Long> filterSourceIdByVersion(List<Long> sourceIdList, AdActivityType type, List<Long> versionIdList);



}