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

admin

2019-09-06 2b35e920a8873ba81530f4d86002a459185725ff

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





}