Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-23 ac8e9b9d4e5f15369c1c1df49c63378fb1ae6f7b

 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskService.java

@@ -23,4 +23,12 @@
   public List<IntegralTask> listByCid(Long cid);





   /**

    * 
    * @param id

    * @return

    */

   public IntegralTask selectByPrimaryKey(Long id);





}