Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

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