Merge branch 'dev_4'

yujian

2019-05-14 b1f7380b94ff1189759ed14b563fed6534f73ab0

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java

@@ -68,4 +68,10 @@
   List<PushGoods>  listByPushState(List<Long> list);
   
   
   /**
    * 需要执行推送的任务
    * @return
    */
   List<PushGoods> listTask();
	
}