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

admin

2019-08-22 0753e8e2febe83f13d9d7a6071fa5f7b57d7d7f1

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





}