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

admin

2019-08-26 bc6df1cbd259c80539d11ae0107ccb938b570266

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





}