Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

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





}