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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java

@@ -255,4 +255,17 @@
    * @param goods

    */

   public void updateRecommendActivityGoods(TaoBaoGoodsBrief goods);

	
   /**

    * 查询需发布的动态

    * @return

    */

   public List<RecommendActivity> getNeedPublish();



   /**

    * 动态图片

    * @param activityId

    * @return

    */

   public List<String> getImgByActivityId(Long activityId);

}