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

admin

2019-08-30 0272ffc3e7037e10c2ddadeea6c597850903878f

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

@@ -47,5 +47,7 @@
    */

   public IntegralTaskClass getByUniqueKey(String uniqueKey);



   public IntegralTaskClass selectByPrimaryKey(Long id);





}